diff options
-rwxr-xr-x | scripts/dev.sh | 10 | ||||
-rwxr-xr-x | scripts/install.sh | 10 | ||||
-rwxr-xr-x | scripts/update.sh | 10 |
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 | ||
5 | COMPOSER_COMMAND='composer' | 5 | COMPOSER_COMMAND='composer' |
6 | REQUIRE_FILE='scripts/require.sh' | ||
6 | 7 | ||
7 | DIR="${BASH_SOURCE}" | 8 | if [ ! -f "$REQUIRE_FILE" ]; then |
8 | if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi | 9 | echo "Cannot find $REQUIRE_FILE" |
9 | . "$DIR/require.sh" | 10 | exit 1 |
11 | fi | ||
12 | |||
13 | . "$REQUIRE_FILE" | ||
10 | 14 | ||
11 | $COMPOSER_COMMAND install | 15 | $COMPOSER_COMMAND install |
12 | php bin/console wallabag:install | 16 | php 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 | |||
25 | fi | 25 | fi |
26 | 26 | ||
27 | COMPOSER_COMMAND='composer' | 27 | COMPOSER_COMMAND='composer' |
28 | REQUIRE_FILE='scripts/require.sh' | ||
28 | 29 | ||
29 | DIR="${BASH_SOURCE}" | 30 | if [ ! -f "$REQUIRE_FILE" ]; then |
30 | if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi | 31 | echo "Cannot find $REQUIRE_FILE" |
31 | . "$DIR/require.sh" | 32 | exit 1 |
33 | fi | ||
34 | |||
35 | . "$REQUIRE_FILE" | ||
32 | 36 | ||
33 | TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) | 37 | TAG=$(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 | |||
28 | set -u | 28 | set -u |
29 | 29 | ||
30 | COMPOSER_COMMAND='composer' | 30 | COMPOSER_COMMAND='composer' |
31 | REQUIRE_FILE='scripts/require.sh' | ||
31 | 32 | ||
32 | DIR="${BASH_SOURCE}" | 33 | if [ ! -f "$REQUIRE_FILE" ]; then |
33 | if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi | 34 | echo "Cannot find $REQUIRE_FILE" |
34 | . "$DIR/require.sh" | 35 | exit 1 |
36 | fi | ||
37 | |||
38 | . "$REQUIRE_FILE" | ||
35 | 39 | ||
36 | rm -rf var/cache/* | 40 | rm -rf var/cache/* |
37 | git fetch origin | 41 | git fetch origin |