diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-10-31 09:56:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 09:56:07 +0100 |
| commit | e52ee565f7df9566d53577cd127088141641619c (patch) | |
| tree | ae0182eb3ce321f6f201df927e198f09bd07193a | |
| parent | 7d9abd1ab5425626ce3b0b241f2f50879e109375 (diff) | |
| parent | 99692e8c3322f31fa19b010ce488f88c5f3ce43a (diff) | |
| download | wallabag-e52ee565f7df9566d53577cd127088141641619c.tar.gz wallabag-e52ee565f7df9566d53577cd127088141641619c.tar.zst wallabag-e52ee565f7df9566d53577cd127088141641619c.zip | |
Merge pull request #2521 from foxmask/master
fix path for the install scripts
| -rw-r--r-- | scripts/dev.sh | 6 | ||||
| -rw-r--r-- | scripts/install.sh | 6 | ||||
| -rw-r--r-- | scripts/update.sh | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scripts/dev.sh b/scripts/dev.sh index fa3b2d5d..0703ced1 100644 --- a/scripts/dev.sh +++ b/scripts/dev.sh | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | #! /usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | # You can execute this file to install wallabag dev environment | 2 | # You can execute this file to install wallabag dev environment |
| 3 | # eg: `sh dev.sh` | 3 | # eg: `sh dev.sh` |
| 4 | 4 | ||
| 5 | COMPOSER_COMMAND='composer' | 5 | COMPOSER_COMMAND='composer' |
| 6 | 6 | ||
| 7 | DIR="${BASH_SOURCE%/*}" | 7 | DIR="${BASH_SOURCE}" |
| 8 | if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi | 8 | if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi |
| 9 | . "$DIR/require.sh" | 9 | . "$DIR/require.sh" |
| 10 | 10 | ||
| 11 | $COMPOSER_COMMAND install | 11 | $COMPOSER_COMMAND install |
diff --git a/scripts/install.sh b/scripts/install.sh index 7a1f02bd..62a46f4f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | #! /usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | # You can execute this file to install wallabag | 2 | # You can execute this file to install wallabag |
| 3 | # eg: `sh install.sh prod` | 3 | # eg: `sh install.sh prod` |
| 4 | 4 | ||
| 5 | COMPOSER_COMMAND='composer' | 5 | COMPOSER_COMMAND='composer' |
| 6 | 6 | ||
| 7 | DIR="${BASH_SOURCE%/*}" | 7 | DIR="${BASH_SOURCE}" |
| 8 | if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi | 8 | if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi |
| 9 | . "$DIR/require.sh" | 9 | . "$DIR/require.sh" |
| 10 | 10 | ||
| 11 | ENV=$1 | 11 | ENV=$1 |
diff --git a/scripts/update.sh b/scripts/update.sh index 45e93f36..f43c4f24 100644 --- a/scripts/update.sh +++ b/scripts/update.sh | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | #! /usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | # You can execute this file to update wallabag | 2 | # You can execute this file to update wallabag |
| 3 | # eg: `sh update.sh prod` | 3 | # eg: `sh update.sh prod` |
| 4 | 4 | ||
| 5 | COMPOSER_COMMAND='composer' | 5 | COMPOSER_COMMAND='composer' |
| 6 | 6 | ||
| 7 | DIR="${BASH_SOURCE%/*}" | 7 | DIR="${BASH_SOURCE}" |
| 8 | if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi | 8 | if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi |
| 9 | . "$DIR/require.sh" | 9 | . "$DIR/require.sh" |
| 10 | 10 | ||
| 11 | ENV=$1 | 11 | ENV=$1 |