aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Baur <thats@matthiasbaur.me>2019-01-17 20:04:57 +0100
committerMatthias Baur <m.baur@syseleven.de>2019-03-12 15:44:38 +0100
commit7c553a6017c64d98017a6010dc6e77d22ab72da4 (patch)
tree137c5ea1f4b4291774804541cc01c38a54ed2617 /scripts
parenta48ff25d4c9f99dfb8ec1a9a1ae296417af6d9c9 (diff)
downloadwallabag-7c553a6017c64d98017a6010dc6e77d22ab72da4.tar.gz
wallabag-7c553a6017c64d98017a6010dc6e77d22ab72da4.tar.zst
wallabag-7c553a6017c64d98017a6010dc6e77d22ab72da4.zip
Properly source require.sh
Fixes #3571.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/dev.sh10
-rwxr-xr-xscripts/install.sh10
-rwxr-xr-xscripts/update.sh10
3 files changed, 21 insertions, 9 deletions
diff --git a/scripts/dev.sh b/scripts/dev.sh
index 0703ced1..28453be0 100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -3,10 +3,14 @@
3# eg: `sh dev.sh` 3# eg: `sh dev.sh`
4 4
5COMPOSER_COMMAND='composer' 5COMPOSER_COMMAND='composer'
6REQUIRE_FILE='scripts/require.sh'
6 7
7DIR="${BASH_SOURCE}" 8if [ ! -f "$REQUIRE_FILE" ]; then
8if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi 9 echo "Cannot find $REQUIRE_FILE"
9. "$DIR/require.sh" 10 exit 1
11fi
12
13. "$REQUIRE_FILE"
10 14
11$COMPOSER_COMMAND install 15$COMPOSER_COMMAND install
12php bin/console wallabag:install 16php bin/console wallabag:install
diff --git a/scripts/install.sh b/scripts/install.sh
index de1fb8f6..affa715f 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -25,10 +25,14 @@ if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
25fi 25fi
26 26
27COMPOSER_COMMAND='composer' 27COMPOSER_COMMAND='composer'
28REQUIRE_FILE='scripts/require.sh'
28 29
29DIR="${BASH_SOURCE}" 30if [ ! -f "$REQUIRE_FILE" ]; then
30if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi 31 echo "Cannot find $REQUIRE_FILE"
31. "$DIR/require.sh" 32 exit 1
33fi
34
35. "$REQUIRE_FILE"
32 36
33TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) 37TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
34 38
diff --git a/scripts/update.sh b/scripts/update.sh
index e86a76db..3ef10439 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -28,10 +28,14 @@ set -e
28set -u 28set -u
29 29
30COMPOSER_COMMAND='composer' 30COMPOSER_COMMAND='composer'
31REQUIRE_FILE='scripts/require.sh'
31 32
32DIR="${BASH_SOURCE}" 33if [ ! -f "$REQUIRE_FILE" ]; then
33if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi 34 echo "Cannot find $REQUIRE_FILE"
34. "$DIR/require.sh" 35 exit 1
36fi
37
38. "$REQUIRE_FILE"
35 39
36rm -rf var/cache/* 40rm -rf var/cache/*
37git fetch origin 41git fetch origin