diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9596e7e2..746e60f9 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,9 +1,5 @@ name: Main workflow -on: - push: - paths: - - '*' - - '!*.md' +on: [push] jobs: run: name: Run diff --git a/src/darwin.sh b/src/darwin.sh index 513d5a6f..7f8c123a 100644 --- a/src/darwin.sh +++ b/src/darwin.sh @@ -1,28 +1,11 @@ export HOMEBREW_NO_INSTALL_CLEANUP=TRUE -brew tap exolnet/homebrew-deprecated > /dev/null 2>&1; -brew install php@"$1"; -brew link --force --overwrite php@"$1"; +brew tap exolnet/homebrew-deprecated > /dev/null 2>&1 +brew install php@"$1" composer +brew link --force --overwrite php@"$1" ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") ext_dir=$(/usr/bin/php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||") sudo chmod 777 "$ini_file" mkdir -p "$(pecl config-get ext_dir)" -if [ ! -e "/usr/bin/composer" ]; then - EXPECTED_SIGNATURE="$(curl -s https://composer.github.io/installer.sig)" - curl -s -L https://getcomposer.org/installer > composer-setup.php - ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" - - if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then - >&2 echo 'ERROR: Invalid installer signature' - rm composer-setup.php - exit 1 - fi - - COMPOSER_ALLOW_SUPERUSER=1 - sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer - RESULT=$? - rm composer-setup.php - exit $RESULT -fi composer global require hirak/prestissimo php -v composer -V diff --git a/src/linux.sh b/src/linux.sh index deec7dbc..894dec32 100644 --- a/src/linux.sh +++ b/src/linux.sh @@ -18,16 +18,12 @@ if [ ! -e "/usr/bin/composer" ]; then ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then - >&2 echo 'ERROR: Invalid installer signature' - rm composer-setup.php - exit 1 + >&2 echo 'ERROR: Invalid installer signature' + else + COMPOSER_ALLOW_SUPERUSER=1 + sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer fi - - COMPOSER_ALLOW_SUPERUSER=1 - sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer - RESULT=$? - rm composer-setup.php - exit $RESULT + rm composer-setup.php fi composer global require hirak/prestissimo > /dev/null 2>&1