YunoHost/install_script
1
0
Fork 0
mirror of https://github.com/YunoHost/install_script.git synced 2024-09-03 20:06:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix tests which were badly written. Use double brackets consistently

Browse source
This commit is contained in:
Julien Malik 2015-09-03 18:17:03 +02:00
parent 7206d06708
commit 8f4a1533f3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
install_yunohostv2
View file

@ -54,7 +54,7 @@ $1
this_script_path() { this_script_path() {
# http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in # http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
local SOURCE="${BASH_SOURCE[0]}" local SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink while [[ -h "$SOURCE" ]]; do # resolve $SOURCE until the file is no longer a symlink
local DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" local DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")" SOURCE="$(readlink "$SOURCE")"
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
@ -64,7 +64,7 @@ this_script_path() {
} }
ensure_root() { ensure_root() {
if [ "$(id -u)" != "0" ] ; if [[ "$(id -u)" != "0" ]] ;
then then
return 1 return 1
fi fi
@ -121,7 +121,7 @@ set_domain() {
# Configure hostname to yunohost.yunohost.org if not already set # Configure hostname to yunohost.yunohost.org if not already set
# NOTE: This is done also during postinstall "to avoid amavis bug" # NOTE: This is done also during postinstall "to avoid amavis bug"
# so we might not need it here # so we might not need it here
[ "$(hostname -d > /dev/null 2>&1)" != "" ] || hostname yunohost.yunohost.org > /dev/null 2>&1 [[ "$(hostname -d > /dev/null 2>&1)" != "" ]] || hostname yunohost.yunohost.org > /dev/null 2>&1
} }
confirm_installation() { confirm_installation() {
@ -148,7 +148,7 @@ setup_package_source() {
echo "deb http://repo.yunohost.org/ megusta main" > $CUSTOMAPT echo "deb http://repo.yunohost.org/ megusta main" > $CUSTOMAPT
# Also add repositories for 'testing' and/or 'unstable' if the script has been called with those arguments # Also add repositories for 'testing' and/or 'unstable' if the script has been called with those arguments
if [ $# -gt 0 ]; then if [[ "$#" > "0" ]]; then
if [[ "$1" == "test" ]] || [[ "$1" == "testing" ]] ; then if [[ "$1" == "test" ]] || [[ "$1" == "testing" ]] ; then
echo "deb http://repo.yunohost.org/ testing main" >> $CUSTOMAPT echo "deb http://repo.yunohost.org/ testing main" >> $CUSTOMAPT
fi fi
@ -170,7 +170,7 @@ apt_update() {
} }
register_debconf() { register_debconf() {
if [ $(lsb_release -c | awk '{print $2}') = jessie ]; if [[ $(lsb_release -c | awk '{print $2}') == jessie ]];
then then
debconf-set-selections $(this_script_path)/debconfjessie debconf-set-selections $(this_script_path)/debconfjessie
else else
@ -196,11 +196,11 @@ workaround_avahi_installation() {
# consecutive uids). # consecutive uids).
# Return without error if avahi already exists # Return without error if avahi already exists
[ $(id avahi > /dev/null 2>&1) ] || return 0 id avahi > /dev/null 2>&1 || return 0
# Get a random unused uid between 500 and 999 (system-user) # Get a random unused uid between 500 and 999 (system-user)
local avahi_id=$((500 + $RANDOM % 500)) local avahi_id=$((500 + $RANDOM % 500))
while [ $(cat /etc/passwd | cut -d ':' -f 3 | grep $avahi_id) ] ; while ! cat /etc/passwd | cut -d ':' -f 3 | grep -q $avahi_id ;
do do
avahi_id=$((500 + $RANDOM % 500)) avahi_id=$((500 + $RANDOM % 500))
done done
@ -263,7 +263,7 @@ Do you want to proceed with YunoHost post-installation now?
/usr/bin/yunohost tools postinstall /usr/bin/yunohost tools postinstall
local POSTINSTALL_EXIT_CODE="$?" local POSTINSTALL_EXIT_CODE="$?"
while [ "$POSTINSTALL_EXIT_CODE" -ne 0 ] ; while [[ "$POSTINSTALL_EXIT_CODE" != "0" ]] ;
do do
local text_retry=" local text_retry="
Yunohost post-installation has failed. Yunohost post-installation has failed.