stop quoting run_as_app_user args

because "$@" splits positional parameters, but quoting the args makes
them one arg, which doesn't work
This commit is contained in:
Jeremy Price 2023-11-30 10:22:59 -08:00
parent 5e539da3da
commit d5881736cf

View file

@ -215,8 +215,8 @@ install_composer () {
fi fi
if [[ "$distro" == "Debian" ]]; then if [[ "$distro" == "Debian" ]]; then
run_as_app_user "php $COMPOSER_PATH/composer-setup.php" run_as_app_user php $COMPOSER_PATH/composer-setup.php
run_as_app_user "rm $COMPOSER_PATH/composer-setup.php" run_as_app_user rm $COMPOSER_PATH/composer-setup.php
else else
run_as_app_user php composer-setup.php run_as_app_user php composer-setup.php
run_as_app_user rm composer-setup.php run_as_app_user rm composer-setup.php
@ -262,7 +262,7 @@ install_snipeit () {
echo "* Running composer." echo "* Running composer."
# We specify the path to composer because CentOS lacks /usr/local/bin in $PATH when using sudo # We specify the path to composer because CentOS lacks /usr/local/bin in $PATH when using sudo
if [[ "$distro" == "Debian" ]]; then if [[ "$distro" == "Debian" ]]; then
run_as_app_user "/usr/local/bin/composer install --no-dev --prefer-source --working-dir "$APP_PATH"" run_as_app_user /usr/local/bin/composer install --no-dev --prefer-source --working-dir "$APP_PATH"
else else
echo "* This can take 5 minutes or more. Tail $APP_LOG for more full command output." & pid=$! echo "* This can take 5 minutes or more. Tail $APP_LOG for more full command output." & pid=$!
progress progress
@ -455,7 +455,7 @@ case $distro in
echo "* Clearing cache and setting final permissions." echo "* Clearing cache and setting final permissions."
chmod 777 -R $APP_PATH/storage/framework/cache/ chmod 777 -R $APP_PATH/storage/framework/cache/
run_as_app_user "php $APP_PATH/artisan cache:clear" run_as_app_user php $APP_PATH/artisan cache:clear
chmod 775 -R $APP_PATH/storage/ chmod 775 -R $APP_PATH/storage/
elif [[ "$version" =~ ^11 ]]; then elif [[ "$version" =~ ^11 ]]; then
@ -492,7 +492,7 @@ case $distro in
echo "* Clearing cache and setting final permissions." echo "* Clearing cache and setting final permissions."
chmod 777 -R $APP_PATH/storage/framework/cache/ chmod 777 -R $APP_PATH/storage/framework/cache/
run_as_app_user "php $APP_PATH/artisan cache:clear" run_as_app_user php $APP_PATH/artisan cache:clear
chmod 775 -R $APP_PATH/storage/ chmod 775 -R $APP_PATH/storage/
elif [[ "$version" =~ ^10 ]]; then elif [[ "$version" =~ ^10 ]]; then
@ -529,7 +529,7 @@ case $distro in
echo "* Clearing cache and setting final permissions." echo "* Clearing cache and setting final permissions."
chmod 777 -R $APP_PATH/storage/framework/cache/ chmod 777 -R $APP_PATH/storage/framework/cache/
run_as_app_user "php $APP_PATH/artisan cache:clear" run_as_app_user php $APP_PATH/artisan cache:clear
chmod 775 -R $APP_PATH/storage/ chmod 775 -R $APP_PATH/storage/
elif [[ "$version" =~ ^9 ]]; then elif [[ "$version" =~ ^9 ]]; then