Increase readability (#91)

backup and restore/sync.sh

@@ -20,4 +20,3 @@ function sync_backup ()
 
 
 sync_backup
-

debian-config-functions-network

@@ -273,7 +273,7 @@ function check_port ()
 # check wifi high throughput
 #
 function check_ht_capab ()
-	{
+{
 	declare -a arr=("[HT40+][LDPC][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][DSSS_CCK-40][SMPS-STATIC]" \
 	"[HT40-][SHORT-GI-40][SHORT-GI-40][DSSS_CCK-40]" "[SHORT-GI-20][SHORT-GI-40][HT40+]" "[DSSS_CK-40][HT20+]" "")
 	local j=0

debian-software

@@ -306,7 +306,7 @@ declare -a PACKETS=($1)
 #skupaj=$(apt-get -s -y -qq install $1 | wc -l)
 skupaj=${#PACKETS[@]}
 while [[ $i -lt $skupaj ]]; do
-procent=$(echo "scale=2;($j/$skupaj)*100"|bc)
+	procent=$(echo "scale=2;($j/$skupaj)*100"|bc)
 	x=${PACKETS[$i]}
 	if [ $(dpkg-query -W -f='${Status}' $x 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
 		printf '%.0f\n' $procent | dialog \
@@ -335,24 +335,15 @@ alive_port ()
 # Displays URL to the service $1 on port $2 or just that is active if $3 = boolean $4 = path
 #
 if [[ -n $(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ".'$2'"') ]]; then
-
 	if [[ $3 == boolean ]]; then
-
 		DESCRIPTION="$1 is \Z1active\Z0";
-
 	elif [[ $3 == ssl ]]; then
-
 		DESCRIPTION="Active on https://${serverIP}:\Z1$2\Z0$4";
-
 	else
-
 		DESCRIPTION="Active on http://${serverIP}:\Z1$2\Z0$4";
-
 	fi
 else
-
 	DESCRIPTION="$1";
-
 fi
 }
 
@@ -1093,10 +1084,10 @@ install_packet "debconf-utils unzip build-essential html2text apt-transport-http
 URL=$(wget -q $PREFIX -O - | html2text | grep rtm | awk ' { print $(NF) }' | tail -1)
 SUFIX="${URL/-tree/}"
 if [ "$(dpkg --print-architecture | grep armhf)" != "" ]; then
-DLURL=$PREFIX$URL"/Linux/SoftEther_VPN_Client/32bit_-_ARM_EABI/softether-vpnclient-$SUFIX-linux-arm_eabi-32bit.tar.gz"
+	DLURL=$PREFIX$URL"/Linux/SoftEther_VPN_Client/32bit_-_ARM_EABI/softether-vpnclient-$SUFIX-linux-arm_eabi-32bit.tar.gz"
 else
-install_packet "gcc-multilib" "Install libraries"
-DLURL=$PREFIX$URL"/Linux/SoftEther_VPN_Client/32bit_-_Intel_x86/softether-vpnclient-$SUFIX-linux-x86-32bit.tar.gz"
+	install_packet "gcc-multilib" "Install libraries"
+	DLURL=$PREFIX$URL"/Linux/SoftEther_VPN_Client/32bit_-_Intel_x86/softether-vpnclient-$SUFIX-linux-x86-32bit.tar.gz"
 fi
 wget -q $DLURL -O - | tar -xz
 cd vpnclient
@@ -1251,15 +1242,15 @@ install_phpmyadmin ()
 # Phpmyadmin unattended installation
 #
 if [[ "$family" != "Ubuntu" ]]; then
-DEBIAN_FRONTEND=noninteractive debconf-apt-progress -- apt-get -y install phpmyadmin
+	DEBIAN_FRONTEND=noninteractive debconf-apt-progress -- apt-get -y install phpmyadmin
 else
-debconf-set-selections <<< "phpmyadmin phpmyadmin/internal/skip-preseed boolean true"
-debconf-set-selections <<< "phpmyadmin phpmyadmin/reconfigure-webserver multiselect true"
-debconf-set-selections <<< "phpmyadmin phpmyadmin/dbconfig-install boolean false"
-echo "phpmyadmin phpmyadmin/internal/skip-preseed boolean true" | debconf-set-selections
-echo "phpmyadmin phpmyadmin/reconfigure-webserver multiselect" | debconf-set-selections
-echo "phpmyadmin phpmyadmin/dbconfig-install boolean false" | debconf-set-selections
-debconf-apt-progress -- apt-get install -y phpmyadmin
+	debconf-set-selections <<< "phpmyadmin phpmyadmin/internal/skip-preseed boolean true"
+	debconf-set-selections <<< "phpmyadmin phpmyadmin/reconfigure-webserver multiselect true"
+	debconf-set-selections <<< "phpmyadmin phpmyadmin/dbconfig-install boolean false"
+	echo "phpmyadmin phpmyadmin/internal/skip-preseed boolean true" | debconf-set-selections
+	echo "phpmyadmin phpmyadmin/reconfigure-webserver multiselect" | debconf-set-selections
+	echo "phpmyadmin phpmyadmin/dbconfig-install boolean false" | debconf-set-selections
+	debconf-apt-progress -- apt-get install -y phpmyadmin
 fi
 # Apache2 needs additional hack
 WWW_RECONFIG=$(expect -c "
@@ -1568,10 +1559,10 @@ cd ${TEMP_DIR}/ispconfig3_install/install/
 php -q install.php --autoinstall=${TEMP_DIR}/isp.conf.php &>> /var/log/ispconfig_config.log
 dialog --colors --backtitle "$BACKTITLE" --no-collapse --title " Auto updating SSL certificate " --clear --yesno "\nDo you want to secure ISPConfig control panel and all services with free Let's Encrypt SSL certificate?" 8 80
 if [[ $? == 0 ]]; then
-dialog --colors --backtitle "$BACKTITLE" --no-collapse --title " Instructions " --clear --msgbox "\n1. Access admin panel with your browser: \Z1https://$serverIP:8080\Z0\n\nUsername: \Z1admin\Z0\nPassword: \Z11234\Z0 \n\n\n2. Go to Sites > Website > \Z1Add new website\Z0\n\nDomain: \Z1$(hostname -f)\Z0\nAuto-Subdomain: \Z1None\Z0\nSSL: \Z1enable\Z0\nLet's Encrypt SSL: \Z1enable\Z0\n\n\n3. Go to Tools > \Z1Password and language\Z0\n\nChange ISPConfig control panel password.\n\nSave and Logout. \n\n\n4. Wait until SSL is not working here: \Z1https://$(hostname -f)\Z0 \n\nIt can take up to a few minutes.\n\n\n5. Proceed with install (\Z1Press ENTER\Z0):" 33 80
-curl -sSL https://github.com/ahrasis/LE4ISPC/archive/master.zip > master.zip  2> /dev/null
-unzip -qq master.zip
-bash LE4ISPC-master/${server}/le4ispc.sh 2>&1
+	dialog --colors --backtitle "$BACKTITLE" --no-collapse --title " Instructions " --clear --msgbox "\n1. Access admin panel with your browser: \Z1https://$serverIP:8080\Z0\n\nUsername: \Z1admin\Z0\nPassword: \Z11234\Z0 \n\n\n2. Go to Sites > Website > \Z1Add new website\Z0\n\nDomain: \Z1$(hostname -f)\Z0\nAuto-Subdomain: \Z1None\Z0\nSSL: \Z1enable\Z0\nLet's Encrypt SSL: \Z1enable\Z0\n\n\n3. Go to Tools > \Z1Password and language\Z0\n\nChange ISPConfig control panel password.\n\nSave and Logout. \n\n\n4. Wait until SSL is not working here: \Z1https://$(hostname -f)\Z0 \n\nIt can take up to a few minutes.\n\n\n5. Proceed with install (\Z1Press ENTER\Z0):" 33 80
+	curl -sSL https://github.com/ahrasis/LE4ISPC/archive/master.zip > master.zip  2> /dev/null
+	unzip -qq master.zip
+	bash LE4ISPC-master/${server}/le4ispc.sh 2>&1
 fi
 }
 

scripts/tv_grab_file

@@ -53,4 +53,3 @@ then
 fi
 
 exit 0
-