Alternative logo + misc tweak / cleaning

This commit is contained in:
Alexandre Aubin 2018-05-17 22:23:18 +02:00
parent a897ec94f8
commit 2a4713f785

View file

@ -16,15 +16,13 @@ done
# #
LOGO=$(cat << 'EOF' LOGO=$(cat << 'EOF'
'. ' '' -d. .--------------.
/M+ h- .shh/ // /NMy- hMdosso | \\ / _ _ |
'MN' /' '. -' :+ N: .Nmyym yo .MN' omNds: :mN' .sydMMMNds+ | | |_|| |(_) |
sMh:/dN: :M' m: oMh' .M: dy h' MM: 'Mo oMh:-sMh /ddNdyyNM' | |
.sMMy' /M' /M- sMMd/sM- -Ms +M+ MM: +M/ mM' -Md 'NM. hM. | |_| _ __|_ |
mM .M- :NN yMMMMMM: .dMNNMd' -/oMMmhmMMh /msosNM/ ::oMM. +M: | | |(_)_\\ | |
'MN sMNMM+ mN:.+mM+ -+o/ :hMMm+- 'oN- :oyo- 'yho. - '______________'
hy /yy: :- -. -Nh '
.
EOF EOF
) )
@ -35,15 +33,17 @@ EOF
# #
LOGO_AND_FINGERPRINTS=$(cat << EOF LOGO_AND_FINGERPRINTS=$(cat << EOF
"$LOGO"
IP: ${ip} $LOGO
SSH fingerprints:
${fingerprint[0]} IP: ${ip}
${fingerprint[1]} SSH fingerprints:
${fingerprint[2]} ${fingerprint[0]}
${fingerprint[3]} ${fingerprint[1]}
${fingerprint[4]} ${fingerprint[2]}
${fingerprint[3]}
${fingerprint[4]}
EOF EOF
) )
@ -55,25 +55,23 @@ then
chvt 2 chvt 2
echo "$LOGO_AND_FINGERPRINTS" echo "$LOGO_AND_FINGERPRINTS"
echo -e "\e[m Post-installation \e[0m" echo -e "\e[m Post-installation \e[0m"
echo "Congratulations! YunoHost has been successfully installed. echo "Congratulations! YunoHost has been successfully installed.\nTwo more steps are required to activate the services of your server."
Two more steps are required to activate the services of your server."
read -p "Proceed to post-installation? (y/n) " -n 1 read -p "Proceed to post-installation? (y/n) " -n 1
RESULT=1 RESULT=1
while [ $RESULT -gt 0 ]; do while [ $RESULT -gt 0 ]; do
if [[ $REPLY =~ ^[Nn]$ ]]; then if [[ $REPLY =~ ^[Nn]$ ]]; then
chvt 1 chvt 1
exit 0 exit 0
fi fi
echo -e "\n" echo -e "\n"
/usr/bin/yunohost tools postinstall /usr/bin/yunohost tools postinstall
let RESULT=$? let RESULT=$?
if [ $RESULT -gt 0 ]; then if [ $RESULT -gt 0 ]; then
echo -e "\n" echo -e "\n"
read -p "Retry? (y/n) " -n 1 read -p "Retry? (y/n) " -n 1
fi fi
done done
fi fi
else # YunoHost is already post-installed else # YunoHost is already post-installed
echo "$LOGO_AND_FINGERPRINTS" > /etc/issue echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
fi fi