[fix] Remove the force option (oups)

This commit is contained in:
ljf (zamentur) 2017-08-30 13:18:34 +02:00 committed by GitHub
parent 1a83fa6812
commit e77719bf69

View file

@ -181,15 +181,13 @@ Are you sure you want to proceed with the installation of Yunohost?
setup_package_source() { setup_package_source() {
local CUSTOMAPT=/etc/apt/sources.list.d/yunohost.list local CUSTOMAPT=/etc/apt/sources.list.d/yunohost.list
if [ "${FORCE}" == 0 ]; then # Check current system version and dependencies
# Check current system version and dependencies if [[ $(lsb_release -c | awk '{print $2}') != jessie ]]; then
if [[ $(lsb_release -c | awk '{print $2}') != jessie ]]; then echo "Current $DISTRIB only works on Debian Jessie for the moment."
echo "Current $DISTRIB only works on Debian Jessie for the moment." return 1
return 1 elif ! command -v systemctl > /dev/null ; then
elif ! command -v systemctl > /dev/null ; then echo "Current $DISTRIB only works with systemd for the moment."
echo "Current $DISTRIB only works with systemd for the moment." return 1
return 1
fi
fi fi
# Debian repository # Debian repository
@ -421,8 +419,7 @@ set -u
AUTOMODE=0 AUTOMODE=0
DISTRIB=stable DISTRIB=stable
BUILD_IMAGE=0 BUILD_IMAGE=0
FORCE=0 while getopts ":aid:h" option; do
while getopts ":aifd:h" option; do
case $option in case $option in
a) a)
AUTOMODE=1 AUTOMODE=1
@ -435,10 +432,6 @@ while getopts ":aifd:h" option; do
# This hidden option will allow to build generic image for Rpi/Olimex # This hidden option will allow to build generic image for Rpi/Olimex
BUILD_IMAGE=1 BUILD_IMAGE=1
;; ;;
f)
# Force installation (aka I know that I do)
FORCE=1
;;
h) h)
usage usage
exit 0 exit 0