Merge pull request #539 from OPUS4/install

Fix Composer usage in install script

bin/install-composer.sh

@@ -19,7 +19,6 @@ set -e
 SCRIPT_NAME_FULL="`readlink -f "$0"`"
 SCRIPT_PATH="`dirname "$SCRIPT_NAME_FULL"`"
 
-
 BASEDIR="`dirname "$SCRIPT_PATH"`"
 
 # Don't run Composer as root - Composer itself warns against that
@@ -28,8 +27,19 @@ if [[ $EUID -eq 0 ]]; then
     exit 1
 fi
 
-if [ -e composer ] ;
+# get BASEDIR from first argument if present
+if [ $# -ge 1 ] ;
+then
+    INSTALL_PACKAGES=1
+fi
+
+if [ -e bin/composer ] ;
 then
+  if [[ "$INSTALL_PACKAGES" == 1 ]] ;
+  then
+    cd $BASEDIR
+    php bin/composer install
+  fi
   exit 1
 fi
 
@@ -47,4 +57,11 @@ fi
 php composer-setup.php --quiet --install-dir="$BASEDIR/bin" --filename=composer
 RESULT=$?
 rm composer-setup.php
+
+if [[ "$INSTALL_PACKAGES" == 1 ]] ;
+then
+  cd $BASEDIR
+  php bin/composer install
+fi
+
 exit $RESULT

bin/install.sh

@@ -119,9 +119,9 @@ echo
 
 if [[ $SUDO_ENABLED -eq 0 ]] ;
 then
-    "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
+    "$SCRIPT_PATH/install-composer.sh" install
 else
-    sudo -u "$SUDO_USER" "$SCRIPT_PATH/install-composer.sh" "$BASEDIR"
+    sudo -u "$SUDO_USER" "$SCRIPT_PATH/install-composer.sh" install
 fi
 
 #