3 files changed, 42 insertions, 17 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 @@
 # eg: `sh dev.sh`
 
 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'
 
-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
+
+. "$REQUIRE_FILE"
 
 $COMPOSER_COMMAND install
 php bin/console wallabag:install
diff --git a/scripts/install.sh b/scripts/install.sh
index 8b7ea03f..affa715f 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -5,9 +5,17 @@
 IGNORE_ROOT_ARG="--ignore-root-warning"
 IGNORE_ROOT=0
 
-if [ "$1" == "$IGNORE_ROOT_ARG" ]; then
-    IGNORE_ROOT=1
-fi
+while :; do
+    case $1 in
+        $IGNORE_ROOT_ARG) IGNORE_ROOT=1
+        ;;
+        *[a-zA-Z]) ENV=$1
+        ;;
+        *) break
+        ;;
+    esac
+    shift
+done
 
 # Abort running this script if root
 if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
@@ -17,12 +25,15 @@ if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
 fi
 
 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'
+
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
 
-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+. "$REQUIRE_FILE"
 
-ENV=$1
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
 
 git checkout $TAG
diff --git a/scripts/update.sh b/scripts/update.sh
index c62d104a..3ef10439 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -5,9 +5,17 @@
 IGNORE_ROOT_ARG="--ignore-root-warning"
 IGNORE_ROOT=0
 
-if [ "$1" == "$IGNORE_ROOT_ARG" ]; then
-    IGNORE_ROOT=1
-fi
+while :; do
+    case $1 in
+        $IGNORE_ROOT_ARG) IGNORE_ROOT=1
+        ;;
+        *[a-zA-Z]) ENV=$1
+        ;;
+        *) break
+        ;;
+    esac
+    shift
+done
 
 # Abort running this script if root
 if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
@@ -20,12 +28,14 @@ set -e
 set -u
 
 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'
 
-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
 
-ENV=$1
+. "$REQUIRE_FILE"
 
 rm -rf var/cache/*
 git fetch origin