albert/Proxmox
1
0
Fork 0
mirror of https://github.com/tteck/Proxmox.git synced 2025-02-15 06:09:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix escape codes;

Browse source 
When running certain scripts, sometimes an 'm' character is wrongly
output to the terminal. This PR fixes all instances of this happening.
I've also made 'RD' (red) consistent with 'GN' (green) by removing the
leading 0, and my editor has kindly removed all trailing spaces from
files.
This commit is contained in:
Gavin Laking 2022-10-16 15:30:36 +01:00
parent bfeb4105e9
commit ee5b965cd6
225 changed files with 2043 additions and 2049 deletions
Download patch file Download diff file Expand all files Collapse all files

16
vm/haos-vm-v4.sh
View file

@ -9,11 +9,11 @@ LATEST=$(curl -s https://api.github.com/repos/home-assistant/operating-system/re
YW=`echo "\033[33m"`
BL=`echo "\033[36m"`
HA=`echo "\033[1;34m"`
RD=`echo "\033[01;31m"`
RD=`echo "\033[1;31m"`
BGN=`echo "\033[4;92m"`
GN=`echo "\033[1;92m"`
DGN=`echo "\033[32m"`
CL=`echo "\033[m"`
CL=`echo "\033[0m"`
BFR="\\r\\033[K"
HOLD="-"
CM="${GN}✓${CL}"
@ -67,10 +67,10 @@ function header_info {
echo -e "${HA}
__ __ ___ ____ _____
/ / / // |v4/ __ \/ ___/
/ /_/ // /| | / / / /\__ \
/ __ // ___ |/ /_/ /___/ /
/_/ /_//_/ |_|\____//____/
Home Assistant OS
/ /_/ // /| | / / / /\__ \
/ __ // ___ |/ /_/ /___/ /
/_/ /_//_/ |_|\____//____/
Home Assistant OS
${CL}"
}
function msg_info() {
@ -160,7 +160,7 @@ if [ $exitstatus = 0 ]; then
else
VLAN=",tag=$VLAN1"
echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
fi
fi
fi
if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}"
@ -221,7 +221,7 @@ fi
msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
msg_info "Getting URL for Home Assistant ${BRANCH} Disk Image"
if [ "$BRANCH" == "$DEV" ]; then
if [ "$BRANCH" == "$DEV" ]; then
URL=https://os-builds.home-assistant.io/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz
else
URL=https://github.com/home-assistant/operating-system/releases/download/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz

14
vm/haos_vm.sh
View file

@ -8,11 +8,11 @@ DEV=$(curl -s https://raw.githubusercontent.com/home-assistant/version/master/de
YW=`echo "\033[33m"`
BL=`echo "\033[36m"`
HA=`echo "\033[1;34m"`
RD=`echo "\033[01;31m"`
RD=`echo "\033[1;31m"`
BGN=`echo "\033[4;92m"`
GN=`echo "\033[1;92m"`
DGN=`echo "\033[32m"`
CL=`echo "\033[m"`
CL=`echo "\033[0m"`
BFR="\\r\\033[K"
HOLD="-"
CM="${GN}✓${CL}"
@ -64,9 +64,9 @@ function header_info {
echo -e "${HA}
__ _____ ____ _____
/ / / / | / __ \/ ___/
/ /_/ / /| |/ / / /\__ \
/ __ / ___ / /_/ /___/ /
/_/ /_/_/v4|_\____//____/
/ /_/ / /| |/ / / /\__ \
/ __ / ___ / /_/ /___/ /
/_/ /_/_/v4|_\____//____/
Home Assistant OS
${CL}"
}
@ -163,7 +163,7 @@ if [ $exitstatus = 0 ]; then
else
VLAN=",tag=$VLAN1"
echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
fi
fi
fi
if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}"
@ -225,7 +225,7 @@ fi
msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
msg_info "Getting URL for Home Assistant ${BRANCH} Disk Image"
if [ "$BRANCH" == "$DEV" ]; then
if [ "$BRANCH" == "$DEV" ]; then
URL=https://os-builds.home-assistant.io/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz
else
URL=https://github.com/home-assistant/operating-system/releases/download/${BRANCH}/haos_ova-${BRANCH}.qcow2.xz

12
vm/mikrotik-routeros-v4.sh
View file

@ -5,11 +5,11 @@ NEXTID=$(pvesh get /cluster/nextid)
YW=`echo "\033[33m"`
BL=`echo "\033[36m"`
HA=`echo "\033[1;34m"`
RD=`echo "\033[01;31m"`
RD=`echo "\033[1;31m"`
BGN=`echo "\033[4;92m"`
GN=`echo "\033[1;92m"`
DGN=`echo "\033[32m"`
CL=`echo "\033[m"`
CL=`echo "\033[0m"`
BFR="\\r\\033[K"
HOLD="-"
CM="${GN}✓${CL}"
@ -62,9 +62,9 @@ function header_info {
echo -e "${RD}
__ ____ __ __ _ __ ____ __ ____ _____
/ |/ (_) /___________ / /_(_) /__ / __ \____ __ __/ /____ _____/ __ \/ ___/
/ /|_/ / / //_/ ___/ __ \/ __/ / //_/ / /_/ / __ \/ / / / __/ _ \/ ___/ / / /\__ \
/ / / / / < / / / /_/ / /_/ / < v4 / _ _/ /_/ / /_/ / /_/ __/ / / /_/ /___/ /
/_/ /_/_/_/|_/_/ \____/\__/_/_/|_| /_/ |_|\____/\__,_/\__/\___/_/ \____//____/
/ /|_/ / / //_/ ___/ __ \/ __/ / //_/ / /_/ / __ \/ / / / __/ _ \/ ___/ / / /\__ \
/ / / / / < / / / /_/ / /_/ / < v4 / _ _/ /_/ / /_/ / /_/ __/ / / /_/ /___/ /
/_/ /_/_/_/|_/_/ \____/\__/_/_/|_| /_/ |_|\____/\__,_/\__/\___/_/ \____//____/
${CL}"
}
function msg_info() {
@ -147,7 +147,7 @@ if [ $exitstatus = 0 ]; then
else
VLAN=",tag=$VLAN1"
echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
fi
fi
fi
if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start Mikrotik RouterOS VM when completed?" 10 58); then
echo -e "${DGN}Start Mikrotik RouterOS VM when completed: ${BGN}yes${CL}"

12
vm/pimox-haos-vm-v4.sh
View file

@ -8,11 +8,11 @@ DEV=$(curl -s https://raw.githubusercontent.com/home-assistant/version/master/de
YW=`echo "\033[33m"`
BL=`echo "\033[36m"`
HA=`echo "\033[1;34m"`
RD=`echo "\033[01;31m"`
RD=`echo "\033[1;31m"`
BGN=`echo "\033[4;92m"`
GN=`echo "\033[1;92m"`
DGN=`echo "\033[32m"`
CL=`echo "\033[m"`
CL=`echo "\033[0m"`
BFR="\\r\\033[K"
HOLD="-"
CM="${GN}✓${CL}"
@ -59,9 +59,9 @@ function header_info {
echo -e "${RD}
____ _ __ ___ __ _____ ____ _____
/ __ \(_) / |/ /___ _ __ / / / / | / __ \/ ___/
/ /_/ / /v4_/ /|_/ / __ \| |/_/ / /_/ / /| |/ / / /\__ \
/ ____/ /___/ / / / /_/ /> < / __ / ___ / /_/ /___/ /
/_/ /_/ /_/ /_/\____/_/|_| /_/ /_/_/ |_\____//____/
/ /_/ / /v4_/ /|_/ / __ \| |/_/ / /_/ / /| |/ / / /\__ \
/ ____/ /___/ / / / /_/ /> < / __ / ___ / /_/ /___/ /
/_/ /_/ /_/ /_/\____/_/|_| /_/ /_/_/ |_\____//____/
${CL}"
}
function msg_info() {
@ -150,7 +150,7 @@ if [ $exitstatus = 0 ]; then
else
VLAN=",tag=$VLAN1"
echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
fi
fi
fi
if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}"