Skip to content

Commit

Permalink
Simplifying
Browse files Browse the repository at this point in the history
  • Loading branch information
JVerstry committed Jul 24, 2015
1 parent 979337b commit c843d19
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion misc/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ pushd ${OPENSHIFT_REPO_DIR}/misc

chmod +x make_php
source make_php
check_all
check_php

popd
22 changes: 0 additions & 22 deletions misc/make_php
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,3 @@ function check_php() {
echo "Check PHP ${DIST_PHP_VER} Failed. Start installing"
install_php
}

function check_composer() {

export PATH=${OPENSHIFT_HOMEDIR}/app-root/runtime/bin/:${PATH}
export COMPOSER_HOME="$OPENSHIFT_DATA_DIR/.composer"

if [ ! -f "$OPENSHIFT_DATA_DIR/composer.phar" ]; then
curl -s https://getcomposer.org/installer | php -- --install-dir=$OPENSHIFT_DATA_DIR
else
php $OPENSHIFT_DATA_DIR/composer.phar self-update
fi

( unset GIT_DIR ; cd $OPENSHIFT_REPO_DIR ; php $OPENSHIFT_DATA_DIR/composer.phar install )

}

function check_all() {

check_php
check_composer

}

0 comments on commit c843d19

Please sign in to comment.