Merge pull request #2521 from foxmask/master

fix path for  the install scripts

diff --git a/scripts/dev.sh b/scripts/dev.sh
index fa3b2d5d5de32509e2e4160fd7a8b64ad9407c7f..0703ced1ef9111ef4c08d055db471fb43f50fad3 100644 (file)
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -1,11 +1,11 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to install wallabag dev environment
 # eg: `sh dev.sh`
 
 COMPOSER_COMMAND='composer'
 
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
 . "$DIR/require.sh"
 
 $COMPOSER_COMMAND install

diff --git a/scripts/install.sh b/scripts/install.sh
index 7a1f02bd80888c65fe7c97a2c33cc3e7346bd110..62a46f4fb60f8100b6228cfcc0a28d6f0ff3ec23 100644 (file)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,11 +1,11 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to install wallabag
 # eg: `sh install.sh prod`
 
 COMPOSER_COMMAND='composer'
 
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
 . "$DIR/require.sh"
 
 ENV=$1

diff --git a/scripts/update.sh b/scripts/update.sh
index 45e93f3634eb09609852e5fd205a036ad4359ba2..f43c4f24c999ca0c6a72ca430a62ed66c2194466 100644 (file)
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -1,11 +1,11 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
 COMPOSER_COMMAND='composer'
 
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
 . "$DIR/require.sh"
 
 ENV=$1