aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-27 13:55:17 +0200
committerGitHub <noreply@github.com>2016-10-27 13:55:17 +0200
commit069d39dfaffdc99db44d578250cd366b1af69fd6 (patch)
tree3707e21a1f0a4074bd9353efee7798582eeac18e
parentf3b637fbfee2fa9f66e53cbadd05e85771eece9d (diff)
parentc4d9a8d6d0db2be5c502e257bbeb963e3870d521 (diff)
downloadwallabag-069d39dfaffdc99db44d578250cd366b1af69fd6.tar.gz
wallabag-069d39dfaffdc99db44d578250cd366b1af69fd6.tar.zst
wallabag-069d39dfaffdc99db44d578250cd366b1af69fd6.zip
Merge pull request #2507 from wallabag/add-check-makefile
Added require.sh to check if composer is installed
-rw-r--r--scripts/dev.sh12
-rw-r--r--scripts/install.sh8
-rw-r--r--scripts/require.sh9
-rw-r--r--scripts/update.sh8
4 files changed, 31 insertions, 6 deletions
diff --git a/scripts/dev.sh b/scripts/dev.sh
index 9b89da35..fa3b2d5d 100644
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -1,7 +1,13 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2# You can execute this file to install wallabag dev environmnet 2# You can execute this file to install wallabag dev environment
3# eg: `sh install.sh prod` 3# eg: `sh dev.sh`
4 4
5composer install 5COMPOSER_COMMAND='composer'
6
7DIR="${BASH_SOURCE%/*}"
8if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
9. "$DIR/require.sh"
10
11$COMPOSER_COMMAND install
6php bin/console wallabag:install 12php bin/console wallabag:install
7php bin/console server:run 13php bin/console server:run
diff --git a/scripts/install.sh b/scripts/install.sh
index d7b05a1e..7a1f02bd 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,11 +2,15 @@
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
5command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; } 5COMPOSER_COMMAND='composer'
6
7DIR="${BASH_SOURCE%/*}"
8if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
9. "$DIR/require.sh"
6 10
7ENV=$1 11ENV=$1
8TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) 12TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
9 13
10git checkout $TAG 14git checkout $TAG
11SYMFONY_ENV=$ENV composer install --no-dev -o --prefer-dist 15SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
12php bin/console wallabag:install --env=$ENV 16php bin/console wallabag:install --env=$ENV
diff --git a/scripts/require.sh b/scripts/require.sh
new file mode 100644
index 00000000..ddfb3dd2
--- /dev/null
+++ b/scripts/require.sh
@@ -0,0 +1,9 @@
1#! /usr/bin/env bash
2# File used to check dependencies
3
4if [ ! -f composer.phar ]; then
5 echo "composer.phar not found, we'll see if composer is installed globally."
6 command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; }
7else
8 COMPOSER_COMMAND='composer.phar'
9fi
diff --git a/scripts/update.sh b/scripts/update.sh
index b920a829..45e93f36 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,6 +2,12 @@
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
5COMPOSER_COMMAND='composer'
6
7DIR="${BASH_SOURCE%/*}"
8if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
9. "$DIR/require.sh"
10
5ENV=$1 11ENV=$1
6TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) 12TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
7 13
@@ -9,5 +15,5 @@ rm -rf var/cache/*
9git fetch origin 15git fetch origin
10git fetch --tags 16git fetch --tags
11git checkout $TAG --force 17git checkout $TAG --force
12SYMFONY_ENV=$ENV composer install --no-dev -o --prefer-dist 18SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
13php bin/console cache:clear --env=$ENV 19php bin/console cache:clear --env=$ENV