minor fixes

Author: enoch85

techandme.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 WANIP=$(dig +short myip.opendns.com @resolver1.opendns.com)
 ADDRESS=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
-WPADMINPASS=$(grep -Fxq "Wordpress admin login" /var/adminpass.txt)
+WPADMINPASS=$(grep "WP PASS:" /var/adminpass.txt)
 clear
 figlet -f small Tech and Me
 echo "           https://www.techandme.se"
 echo
 echo
-echo "|NETWORK|"
+echo "--|NETWORK|--"
 echo "WAN IP: $WANIP"
 echo "LAN IP: $ADDRESS"
 echo
-echo "|LOGIN|"
+echo "--|WORDPRESS LOGIN|--"
 echo "WP USER: change_wordpress_user#"
-echo "WP PASS: $WPADMINPASS"
-echo "MySQL: /var/mysql_password.txt"
-
+echo "$WPADMINPASS"
+echo
+echo "--|MySQL|--"
+echo "PASS: /var/mysql_password.txt"
+echo
 exit 0

wordpress_install.sh

@@ -137,25 +137,12 @@ apt-get install -y \
 curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
 chmod +x wp-cli.phar
 mv wp-cli.phar /usr/local/bin/wp
-wp --info
+wp --info --allow-root
 
 # Create dir
 mkdir $WPATH
 
-# Download Wordpress (PLAN B)
-#echo "Downloading..."
-#curl -O https://wordpress.org/latest.tar.gz
-#echo "Unpacking..."
-#tar -zxf latest.tar.gz
-#mv wordpress/* $WPATH
-#echo "Cleaning up..."
-#rm -R  wordpress/
-#rm latest.tar.gz
-
-# Create missing files and folders
-#mv $WPATH/wp-config-sample.php $WPATH/wp-config.php
-#mkdir $WPATH/wp-content/uploads
-
+# Download Wordpress
 cd $WPATH
 wp core download --allow-root --force --debug --path=$WPATH
 
@@ -170,8 +157,8 @@ wp core config --allow-root --dbname=$WPDBNAME --dbuser=$WPDBUSER --dbpass=$WPDB
 echo "Wordpress DB: $WPDBPASS" >> $PW_FILE
 
 # Install Wordpress
-wp core install --allow-root --url=http://$ADDRESS/wordpress/ --title=Wordpress --admin_user=$WPADMINUSER --admin_password=$WPDMINPASS [email protected]
-echo "Wordpress admin login: $WPADMINPASS" > /var/adminpass.txt
+wp core install --allow-root --url=http://$ADDRESS/wordpress/ --title=Wordpress --admin_user=$WPADMINUSER --admin_password=$WPADMINPASS [email protected]
+echo "WP PASS: $WPADMINPASS" > /var/adminpass.txt
 chown wordpress:wordpress /var/adminpass.txt
 
 wp core version --allow-root
@@ -195,7 +182,7 @@ wget -q $GITHUB_REPO/wp-permissions.sh -P $SCRIPTS
 bash $SCRIPTS/wp-permissions.sh
 
 # Hardening security
-#create .htaccess to protect uploads directory
+# create .htaccess to protect uploads directory
 cat > $WPATH/wp-content/uploads/.htaccess <<'EOL'
 # Protect this file
 <Files .htaccess>

wordpress_update.sh

@@ -16,11 +16,11 @@ sudo aptitude full-upgrade -y
 cd $WPATH
 wp db export mysql_backup.sql --allow-root
 wp core update --force --allow-root
-wp plugin update --allow-root
+wp plugin update --all --allow-root
 wp core update-db --allow-root
 wp db optimize --allow-root
 echo
-echo "This is the current version installed:
+echo "This is the current version installed:"
 echo
 wp wp core version --extra --allow-root
 sleep 5