mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Rework condition (and remove the 'from_script' flag)
This commit is contained in:
parent
2a4713f785
commit
c0be9676e3
1 changed files with 22 additions and 25 deletions
|
@ -47,31 +47,28 @@ $LOGO
|
||||||
EOF
|
EOF
|
||||||
)
|
)
|
||||||
|
|
||||||
if [[ ! -f /etc/yunohost/installed ]]
|
if [[ -f /etc/yunohost/installed ]]
|
||||||
then
|
then
|
||||||
if [[ ! -f /etc/yunohost/from_script ]]
|
|
||||||
then
|
|
||||||
sleep 5
|
|
||||||
chvt 2
|
|
||||||
echo "$LOGO_AND_FINGERPRINTS"
|
|
||||||
echo -e "\e[m Post-installation \e[0m"
|
|
||||||
echo "Congratulations! YunoHost has been successfully installed.\nTwo more steps are required to activate the services of your server."
|
|
||||||
read -p "Proceed to post-installation? (y/n) " -n 1
|
|
||||||
RESULT=1
|
|
||||||
while [ $RESULT -gt 0 ]; do
|
|
||||||
if [[ $REPLY =~ ^[Nn]$ ]]; then
|
|
||||||
chvt 1
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
echo -e "\n"
|
|
||||||
/usr/bin/yunohost tools postinstall
|
|
||||||
let RESULT=$?
|
|
||||||
if [ $RESULT -gt 0 ]; then
|
|
||||||
echo -e "\n"
|
|
||||||
read -p "Retry? (y/n) " -n 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
else # YunoHost is already post-installed
|
|
||||||
echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
|
echo "$LOGO_AND_FINGERPRINTS" > /etc/issue
|
||||||
|
else
|
||||||
|
sleep 5
|
||||||
|
chvt 2
|
||||||
|
echo "$LOGO_AND_FINGERPRINTS"
|
||||||
|
echo -e "\e[m Post-installation \e[0m"
|
||||||
|
echo "Congratulations! YunoHost has been successfully installed.\nTwo more steps are required to activate the services of your server."
|
||||||
|
read -p "Proceed to post-installation? (y/n) " -n 1
|
||||||
|
RESULT=1
|
||||||
|
while [ $RESULT -gt 0 ]; do
|
||||||
|
if [[ $REPLY =~ ^[Nn]$ ]]; then
|
||||||
|
chvt 1
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo -e "\n"
|
||||||
|
/usr/bin/yunohost tools postinstall
|
||||||
|
let RESULT=$?
|
||||||
|
if [ $RESULT -gt 0 ]; then
|
||||||
|
echo -e "\n"
|
||||||
|
read -p "Retry? (y/n) " -n 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue