mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-22 09:01:01 +00:00
Code Issues Projects Releases Wiki Activity

Properly source require.sh

Browse source 
Fixes #3571.
This commit is contained in:
Matthias Baur 2019-01-17 20:04:57 +01:00 committed by Matthias Baur
parent a48ff25d4c
commit 7c553a6017
No known key found for this signature in database
GPG key ID: B5FC9F20AD4618D6
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/dev.sh
View file

@ -3,10 +3,14 @@
# eg: `sh dev.sh` # eg: `sh dev.sh`
COMPOSER_COMMAND='composer' COMPOSER_COMMAND='composer'
REQUIRE_FILE='scripts/require.sh'
DIR="${BASH_SOURCE}" if [ ! -f "$REQUIRE_FILE" ]; then
if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi echo "Cannot find $REQUIRE_FILE"
. "$DIR/require.sh" exit 1
fi
. "$REQUIRE_FILE"
$COMPOSER_COMMAND install $COMPOSER_COMMAND install
php bin/console wallabag:install php bin/console wallabag:install

10
scripts/install.sh
View file

@ -25,10 +25,14 @@ if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
fi fi
COMPOSER_COMMAND='composer' COMPOSER_COMMAND='composer'
REQUIRE_FILE='scripts/require.sh'
DIR="${BASH_SOURCE}" if [ ! -f "$REQUIRE_FILE" ]; then
if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi echo "Cannot find $REQUIRE_FILE"
. "$DIR/require.sh" exit 1
fi
. "$REQUIRE_FILE"
TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) TAG=$(git describe --tags $(git rev-list --tags --max-count=1))

10
scripts/update.sh
View file

@ -28,10 +28,14 @@ set -e
set -u set -u
COMPOSER_COMMAND='composer' COMPOSER_COMMAND='composer'
REQUIRE_FILE='scripts/require.sh'
DIR="${BASH_SOURCE}" if [ ! -f "$REQUIRE_FILE" ]; then
if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi echo "Cannot find $REQUIRE_FILE"
. "$DIR/require.sh" exit 1
fi
. "$REQUIRE_FILE"
rm -rf var/cache/* rm -rf var/cache/*
git fetch origin git fetch origin