diff --git a/action.sh b/action.sh index f11f131..f105c12 100755 --- a/action.sh +++ b/action.sh @@ -33,9 +33,8 @@ source config.cfg ACTION=$1 # adduser, changepw, listusers, userdetail, deluser, sizeall, sizeuser, viewdata USER=$2 PASSFILE=$3 # $3 is a file containing the password -PASS=$(cat "$3") - -echo $PASS +PASS=$(cat $PASSFILE) +PATH=$PATH:$HOME/bin ## FUNCTIONS function checkaction { @@ -447,10 +446,6 @@ if [ "$ACTION" == "installwp" ]; then # Create database mysql -e "CREATE DATABASE $MYSQLDB;" - echo $WPMAIL - echo $WPUSER - echo $WPPASS - # Use wp-cli to create config.php and install WP wp-cli core config --dbname=${MYSQLDB} --dbpass=${MYSQLPASS} --dbuser=${MYSQLUSER} --path=${WEBDIR} wp-cli core install --url="$WPDOMAIN" --title="CHANGE THIS TITLE" --admin_user=${WPUSER} --admin_password=${WPPASS} --admin_email=${WPMAIL} --path=${WEBDIR} diff --git a/submit.php b/submit.php index ed92173..97a5017 100644 --- a/submit.php +++ b/submit.php @@ -39,7 +39,7 @@ if($SURE == "yes") $output = shell_exec($command); echo "
$output
"; - # Delete passfile + // Delete passfile unlink($PASSFILE); } else