From 9998c725330b4a99d6d12df60ac8234052e80b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 27 Oct 2016 09:53:09 +0200
Subject: Added require.sh to check if composer is installed

---
 scripts/update.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts/update.sh')

diff --git a/scripts/update.sh b/scripts/update.sh
index b920a829..96a48217 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,6 +2,10 @@
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
+DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+. "$DIR/require.sh"
+
 ENV=$1
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
 
-- 
cgit v1.2.3


From c4d9a8d6d0db2be5c502e257bbeb963e3870d521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 27 Oct 2016 10:09:43 +0200
Subject: Usage of composer.phar if it's found

---
 scripts/update.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/update.sh')

diff --git a/scripts/update.sh b/scripts/update.sh
index 96a48217..45e93f36 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,6 +2,8 @@
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
+COMPOSER_COMMAND='composer'
+
 DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/require.sh"
@@ -13,5 +15,5 @@ rm -rf var/cache/*
 git fetch origin
 git fetch --tags
 git checkout $TAG --force
-SYMFONY_ENV=$ENV composer install --no-dev -o --prefer-dist
+SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
 php bin/console cache:clear --env=$ENV
-- 
cgit v1.2.3


From 038469e73f651621e8a5c12cf089d0c239031b57 Mon Sep 17 00:00:00 2001
From: FoxMaSk <foxmaskhome@gmail.com>
Date: Sun, 30 Oct 2016 22:38:38 +0100
Subject: fix path for  in install scripts

---
 scripts/update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/update.sh')

diff --git a/scripts/update.sh b/scripts/update.sh
index 45e93f36..6fff8a72 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -1,11 +1,11 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`
 
 COMPOSER_COMMAND='composer'
 
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+DIR="${BASH_SOURCE}"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD/scripts"; fi
 . "$DIR/require.sh"
 
 ENV=$1
-- 
cgit v1.2.3


From 99692e8c3322f31fa19b010ce488f88c5f3ce43a Mon Sep 17 00:00:00 2001
From: FoxMaSk <foxmaskhome@gmail.com>
Date: Sun, 30 Oct 2016 22:46:09 +0100
Subject: fix path for  in install scripts

---
 scripts/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/update.sh')

diff --git a/scripts/update.sh b/scripts/update.sh
index 6fff8a72..f43c4f24 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -5,7 +5,7 @@
 COMPOSER_COMMAND='composer'
 
 DIR="${BASH_SOURCE}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD/scripts"; fi
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
 . "$DIR/require.sh"
 
 ENV=$1
-- 
cgit v1.2.3