From 80378ffe67d996aabf9d582ca6d2b8009643fe56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 24 Mar 2020 11:56:16 +0100
Subject: [PATCH] Revert "load helpers in all patches"
This reverts commit 8a05b0b3fd60cbed39b6ce487da827e5d385d90f.
---
patches/patch20150715-0/patch.sh | 1 -
patches/patch20151022-0/patch.sh | 1 -
patches/patch20151111-0/patch.sh | 1 -
patches/patch20151218-0/patch.sh | 1 -
patches/patch20151224-0/patch.sh | 1 -
patches/patch20160111-0/patch.sh | 1 -
patches/patch20160112-0/patch.sh | 1 -
patches/patch20160113-0/patch.sh | 1 -
patches/patch20160114-0/patch.sh | 1 -
patches/patch20160203-0/patch.sh | 1 -
patches/patch20160217-2.0.10/patch.sh | 1 -
patches/patch20160318-2.0.11/patch.sh | 1 -
patches/patch20160319-2.0.12/patch.sh | 1 -
patches/patch20160322-2.0.13/patch.sh | 1 -
patches/patch20160329-2.0.14/patch.sh | 1 -
patches/patch20160423-2.0.15/patch.sh | 1 -
patches/patch20160827-2.0.16/patch.sh | 1 -
patches/patch20160917-2.0.17/patch.sh | 1 -
patches/patch20160919-2.0.18/patch.sh | 1 -
patches/patch20160919-2.0.19/patch.sh | 1 -
patches/patch20170117-2.0.20/patch.sh | 1 -
patches/patch20170118-2.0.21/patch.sh | 1 -
patches/patch20170126-2.0.22/patch.sh | 1 -
patches/patch20170307-2.0.23/patch.sh | 1 -
patches/patch20170313-2.0.24/patch.sh | 1 -
patches/patch20170314-2.0.25/patch.sh | 1 -
patches/patch20170316-2.0.26/patch.sh | 1 -
patches/patch20170316-2.0.27/patch.sh | 1 -
patches/patch20170321-2.0.28/patch.sh | 1 -
patches/patch20170419-2.0.29/patch.sh | 1 -
patches/patch20170825-2.0.30/patch.sh | 1 -
patches/patch20181116-2.0.31/patch.sh | 1 -
patches/patch20181119-2.1.0/patch.sh | 1 -
patches/patch20190327-2.1.1/patch.sh | 1 -
34 files changed, 34 deletions(-)
diff --git a/patches/patch20150715-0/patch.sh b/patches/patch20150715-0/patch.sh
index 31cd0b0..4941c81 100755
--- a/patches/patch20150715-0/patch.sh
+++ b/patches/patch20150715-0/patch.sh
@@ -28,7 +28,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh
if test ! $(mysql_execute "Select CaosDBVersion();" > /dev/null) ; then
uptodate
diff --git a/patches/patch20151022-0/patch.sh b/patches/patch20151022-0/patch.sh
index 5a9d366..7952afe 100755
--- a/patches/patch20151022-0/patch.sh
+++ b/patches/patch20151022-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20151111-0/patch.sh b/patches/patch20151111-0/patch.sh
index 9cdb508..cb1bdbc 100755
--- a/patches/patch20151111-0/patch.sh
+++ b/patches/patch20151111-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20151218-0/patch.sh b/patches/patch20151218-0/patch.sh
index fe3e578..d9ebea9 100755
--- a/patches/patch20151218-0/patch.sh
+++ b/patches/patch20151218-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20151224-0/patch.sh b/patches/patch20151224-0/patch.sh
index b2fe96b..9eb0bd8 100755
--- a/patches/patch20151224-0/patch.sh
+++ b/patches/patch20151224-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160111-0/patch.sh b/patches/patch20160111-0/patch.sh
index 59976ae..d3a18f2 100755
--- a/patches/patch20160111-0/patch.sh
+++ b/patches/patch20160111-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160112-0/patch.sh b/patches/patch20160112-0/patch.sh
index 013768c..b153c1e 100755
--- a/patches/patch20160112-0/patch.sh
+++ b/patches/patch20160112-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160113-0/patch.sh b/patches/patch20160113-0/patch.sh
index a38044b..6535968 100755
--- a/patches/patch20160113-0/patch.sh
+++ b/patches/patch20160113-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160114-0/patch.sh b/patches/patch20160114-0/patch.sh
index 66a0780..f5dfa8d 100755
--- a/patches/patch20160114-0/patch.sh
+++ b/patches/patch20160114-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160203-0/patch.sh b/patches/patch20160203-0/patch.sh
index 983afb8..7ee4621 100755
--- a/patches/patch20160203-0/patch.sh
+++ b/patches/patch20160203-0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160217-2.0.10/patch.sh b/patches/patch20160217-2.0.10/patch.sh
index 06fea88..9a2b32c 100755
--- a/patches/patch20160217-2.0.10/patch.sh
+++ b/patches/patch20160217-2.0.10/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160318-2.0.11/patch.sh b/patches/patch20160318-2.0.11/patch.sh
index c24b93b..edb72c4 100755
--- a/patches/patch20160318-2.0.11/patch.sh
+++ b/patches/patch20160318-2.0.11/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160319-2.0.12/patch.sh b/patches/patch20160319-2.0.12/patch.sh
index bc950f2..0a65f1f 100755
--- a/patches/patch20160319-2.0.12/patch.sh
+++ b/patches/patch20160319-2.0.12/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160322-2.0.13/patch.sh b/patches/patch20160322-2.0.13/patch.sh
index d394a87..fa8d6c8 100755
--- a/patches/patch20160322-2.0.13/patch.sh
+++ b/patches/patch20160322-2.0.13/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
function insert_stats_table {
diff --git a/patches/patch20160329-2.0.14/patch.sh b/patches/patch20160329-2.0.14/patch.sh
index ff65ca5..f0eaddf 100755
--- a/patches/patch20160329-2.0.14/patch.sh
+++ b/patches/patch20160329-2.0.14/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
function add_column {
diff --git a/patches/patch20160423-2.0.15/patch.sh b/patches/patch20160423-2.0.15/patch.sh
index 346e837..b310f10 100755
--- a/patches/patch20160423-2.0.15/patch.sh
+++ b/patches/patch20160423-2.0.15/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
CREATE_SUBJECTS_TABLE="CREATE TABLE subjects ( name VARBINARY(255) NOT NULL PRIMARY KEY, email VARBINARY(255) DEFAULT NULL, status ENUM('ACTIVE','REGISTER', 'INACTIVE', 'RESET') NOT NULL DEFAULT 'INACTIVE') ENGINE=InnoDB;"
diff --git a/patches/patch20160827-2.0.16/patch.sh b/patches/patch20160827-2.0.16/patch.sh
index c15e668..0b2bd44 100755
--- a/patches/patch20160827-2.0.16/patch.sh
+++ b/patches/patch20160827-2.0.16/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
ADD_SECONDS_COLUMN='ALTER TABLE transaction_log ADD COLUMN seconds BIGINT UNSIGNED NOT NULL DEFAULT 0;'
diff --git a/patches/patch20160917-2.0.17/patch.sh b/patches/patch20160917-2.0.17/patch.sh
index b4bb9fd..8aaa64d 100755
--- a/patches/patch20160917-2.0.17/patch.sh
+++ b/patches/patch20160917-2.0.17/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
check_version $OLD_VERSION
diff --git a/patches/patch20160919-2.0.18/patch.sh b/patches/patch20160919-2.0.18/patch.sh
index 4c43df0..03e3c83 100755
--- a/patches/patch20160919-2.0.18/patch.sh
+++ b/patches/patch20160919-2.0.18/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20160919-2.0.19/patch.sh b/patches/patch20160919-2.0.19/patch.sh
index d536631..6b620a2 100755
--- a/patches/patch20160919-2.0.19/patch.sh
+++ b/patches/patch20160919-2.0.19/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170117-2.0.20/patch.sh b/patches/patch20170117-2.0.20/patch.sh
index f5b56f0..a1258b7 100755
--- a/patches/patch20170117-2.0.20/patch.sh
+++ b/patches/patch20170117-2.0.20/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170118-2.0.21/patch.sh b/patches/patch20170118-2.0.21/patch.sh
index c1c2e5b..d53a3b9 100755
--- a/patches/patch20170118-2.0.21/patch.sh
+++ b/patches/patch20170118-2.0.21/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170126-2.0.22/patch.sh b/patches/patch20170126-2.0.22/patch.sh
index 9668b41..2436221 100755
--- a/patches/patch20170126-2.0.22/patch.sh
+++ b/patches/patch20170126-2.0.22/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170307-2.0.23/patch.sh b/patches/patch20170307-2.0.23/patch.sh
index 8f90e28..38ec7ef 100755
--- a/patches/patch20170307-2.0.23/patch.sh
+++ b/patches/patch20170307-2.0.23/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170313-2.0.24/patch.sh b/patches/patch20170313-2.0.24/patch.sh
index 112fcd2..c1fe691 100755
--- a/patches/patch20170313-2.0.24/patch.sh
+++ b/patches/patch20170313-2.0.24/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170314-2.0.25/patch.sh b/patches/patch20170314-2.0.25/patch.sh
index 1996fb9..e80444d 100755
--- a/patches/patch20170314-2.0.25/patch.sh
+++ b/patches/patch20170314-2.0.25/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170316-2.0.26/patch.sh b/patches/patch20170316-2.0.26/patch.sh
index 41ef6bb..ff444cd 100755
--- a/patches/patch20170316-2.0.26/patch.sh
+++ b/patches/patch20170316-2.0.26/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170316-2.0.27/patch.sh b/patches/patch20170316-2.0.27/patch.sh
index b83fbee..ecb892e 100755
--- a/patches/patch20170316-2.0.27/patch.sh
+++ b/patches/patch20170316-2.0.27/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170321-2.0.28/patch.sh b/patches/patch20170321-2.0.28/patch.sh
index 95765b4..20a0561 100755
--- a/patches/patch20170321-2.0.28/patch.sh
+++ b/patches/patch20170321-2.0.28/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170419-2.0.29/patch.sh b/patches/patch20170419-2.0.29/patch.sh
index 9c7125a..44a4d11 100755
--- a/patches/patch20170419-2.0.29/patch.sh
+++ b/patches/patch20170419-2.0.29/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20170825-2.0.30/patch.sh b/patches/patch20170825-2.0.30/patch.sh
index 9569d08..34803bb 100755
--- a/patches/patch20170825-2.0.30/patch.sh
+++ b/patches/patch20170825-2.0.30/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20181116-2.0.31/patch.sh b/patches/patch20181116-2.0.31/patch.sh
index 9273060..36b361b 100755
--- a/patches/patch20181116-2.0.31/patch.sh
+++ b/patches/patch20181116-2.0.31/patch.sh
@@ -32,7 +32,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20181119-2.1.0/patch.sh b/patches/patch20181119-2.1.0/patch.sh
index 9669def..7315ff4 100755
--- a/patches/patch20181119-2.1.0/patch.sh
+++ b/patches/patch20181119-2.1.0/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
diff --git a/patches/patch20190327-2.1.1/patch.sh b/patches/patch20190327-2.1.1/patch.sh
index 4b5422c..7c28455 100755
--- a/patches/patch20190327-2.1.1/patch.sh
+++ b/patches/patch20190327-2.1.1/patch.sh
@@ -30,7 +30,6 @@ if [ -z "$UTILSPATH" ]; then
UTILSPATH="../utils"
fi
-. $UTILSPATH/helpers.sh
. $UTILSPATH/patch_header.sh $*
--
GitLab