From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Mon, 31 Oct 2016 08:56:07 +0000 (+0100)
Subject: Merge pull request #2521 from foxmask/master
X-Git-Tag: 2.1.3~9
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e52ee565f7df9566d53577cd127088141641619c;hp=7d9abd1ab5425626ce3b0b241f2f50879e109375;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2521 from foxmask/master

fix path for  the install scripts
---

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 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to install wallabag dev environment
 # eg: `sh dev.sh`
 
 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"
 
 $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 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 # You can execute this file to install wallabag
 # eg: `sh install.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
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 @@
-#! /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