Add snippet 'get-path-of-php-command.sh' and change concerning code..
This commit is contained in:
@ -334,6 +334,12 @@ source ${snippet_dir}/get-webservice-environment.sh
|
||||
#
|
||||
source ${snippet_dir}/get-php-major-version.sh
|
||||
|
||||
|
||||
# Get full qualified PHP command
|
||||
#
|
||||
source ${snippet_dir}/get-path-of-php-command.sh
|
||||
|
||||
|
||||
CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud`
|
||||
CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data`
|
||||
CURRENT_VERSION=`basename $CURRENT_INSTALL_DIR | cut -d"-" -f2`
|
||||
@ -392,6 +398,8 @@ echo ""
|
||||
echo -e " PHP version..........................: $PHP_VERSION"
|
||||
echo -e " PHP Engine...........................: $PHP_ENGINE"
|
||||
echo ""
|
||||
echo -e " PHP command..........................: $PHP_BIN"
|
||||
echo ""
|
||||
echo -e " Databse name.........................: $DATABASE_NAME"
|
||||
echo -e " Database type........................: $DATABASE_TYPE"
|
||||
echo ""
|
||||
@ -430,7 +438,7 @@ echo ""
|
||||
# -
|
||||
echononl " Remove user \033[37m\033[1m$USER\033[m from group \033[37m\033[1m$GROUP\033[m .."
|
||||
|
||||
su -c "/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'" -s /bin/bash $HTTP_USER > $log_file 2>&1
|
||||
su -c "${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'" -s /bin/bash $HTTP_USER > $log_file 2>&1
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo_ok
|
||||
else
|
||||
@ -438,7 +446,7 @@ else
|
||||
blank_line
|
||||
echo ""
|
||||
echo -e "\033[37m\033[1mcommandline was:\033[m"
|
||||
echo -e "su -c \"/usr/local/php/bin/php ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'\" -s /bin/bash $HTTP_USER"
|
||||
echo -e "su -c \"${PHP_BIN} ${WEB_BASE_DIR}/htdocs/occ group:removeuser '$GROUP' '$USER'\" -s /bin/bash $HTTP_USER"
|
||||
blank_line
|
||||
warn "Despite errors, it is possible that the user \033[37m\033[1m$USER\033[m was removed from the group \033[37m\033[1m$GROUP\033[m"
|
||||
fatal "$(cat $log_file)"
|
||||
|
Reference in New Issue
Block a user