Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Output cleanup for whiptail

Browse Source
This commit is contained in:
Bram Prieshof
2020-10-09 15:09:58 +02:00
parent abe8aefb10
commit 0cb3113ede
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AppendCMS.sh
View File

@@ -152,6 +152,7 @@ CMS="${CMS//:}" && CMS="${CMS,,}"
##-----------## ##-----------##
# AptList # # AptList #
##-----------## ##-----------##
msg " Generating apt list for CMS"
if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list; then if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list; then
curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list curl -s "$repo"/raw/"$branchtype"/"$branch"/CMS/"$CMS"/generic.pkg.list >>/tmp/pkg.list

7
AppendModule.sh
View File

@@ -85,7 +85,7 @@ fi
if [ $IMODE = n ]; then if [ $IMODE = n ]; then
PasswordQuest PasswordQuest
option=$(whiptail --title "Title" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3) option=$(whiptail --title "Config" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
[[ "$?" = 1 ]] && msg " Quiting installer" 8 78 && exit; [[ "$?" = 1 ]] && msg " Quiting installer" 8 78 && exit;
fi fi
@@ -150,7 +150,6 @@ option="$option""$aonoption"
msg " Generating apt list for Options" msg " Generating apt list for Options"
for val1 in ${option[*]}; do for val1 in ${option[*]}; do
echo "$val1" #TMP
modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1") modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
#Checking #Checking
if test -z "$modListed" if test -z "$modListed"
@@ -200,7 +199,7 @@ done
msg " Running preconf for Options" msg " Running preconf for Options"
for val1 in ${option[*]}; do for val1 in ${option[*]}; do
echo "$val1" #TMP msg "Pre-configuring $val1"
modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1") modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
#Checking #Checking
if test -z "$modListed" if test -z "$modListed"
@@ -239,7 +238,7 @@ cat /tmp/pkg.list | xargs $PKGI
msg " Running conf for Options" msg " Running conf for Options"
for val1 in ${option[*]}; do for val1 in ${option[*]}; do
echo "$val1" #TMP msg "Configuring $val1"
modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1") modListed=$(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/extModules.list|grep "$val1")
#Checking #Checking
if test -z "$modListed" if test -z "$modListed"

2
CoreModules/apache/conf.sh
View File

@@ -45,7 +45,7 @@ sed -i -e 's/DOMAINname/'$hostname'/g' /etc/apache2/sites-available/Backend_ssl.
mkdir -p /opt/toggle mkdir -p /opt/toggle
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -O /opt/toggle/toggle-PhpMyAdmin.sh curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-PhpMyAdmin_APACHE.sh -o /opt/toggle/toggle-PhpMyAdmin.sh
# custom Welcome page # custom Welcome page

2
installer.sh
View File

@@ -649,7 +649,7 @@ if [ $sslenable = 1 ]; then
rm -rf /etc/acmesh/certs/$domain* rm -rf /etc/acmesh/certs/$domain*
fi fi
unset certsatus unset certsatus
/opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$hostname" /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$hostname" > $OUTPUT 2>&1
certsatusBackend=$? certsatusBackend=$?
if test $certsatusBackend -eq 0 if test $certsatusBackend -eq 0