diff options
| author | Matthias Baur <thats@matthiasbaur.me> | 2019-01-17 20:04:57 +0100 |
|---|---|---|
| committer | Matthias Baur <m.baur@syseleven.de> | 2019-03-12 15:44:38 +0100 |
| commit | 7c553a6017c64d98017a6010dc6e77d22ab72da4 (patch) | |
| tree | 137c5ea1f4b4291774804541cc01c38a54ed2617 /scripts/install.sh | |
| parent | a48ff25d4c9f99dfb8ec1a9a1ae296417af6d9c9 (diff) | |
| download | wallabag-7c553a6017c64d98017a6010dc6e77d22ab72da4.tar.gz wallabag-7c553a6017c64d98017a6010dc6e77d22ab72da4.tar.zst wallabag-7c553a6017c64d98017a6010dc6e77d22ab72da4.zip | |
Properly source require.sh
Fixes #3571.
Diffstat (limited to 'scripts/install.sh')
| -rwxr-xr-x | scripts/install.sh | 10 |
1 files changed, 7 insertions, 3 deletions
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 | ||