format files

manifest.json

@@ -22,7 +22,7 @@
         "nginx"
     ],
     "arguments": {
-        "install" : [
+        "install": [
             {
                 "name": "domain",
                 "type": "domain",

scripts/_common.sh

@@ -100,34 +100,32 @@ setup_source() {
 	src_format=${src_format:-tar.gz}
 	src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]')
 	src_extract=${src_extract:-true}
-    if [ "$src_filename" = "" ] ; then
+	if [ "$src_filename" = "" ]; then
 		src_filename="${src_id}.${src_format}"
 	fi
 	local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}"
 
 	ynh_print_info "Downloading Gitlab files..."
 
-    if test -e "$local_src"
+	if test -e "$local_src"; then # Use the local source file if it is present
-    then    # Use the local source file if it is present
 		cp $local_src $src_filename
 	else # If not, download the source
 		ynh_print_info $(wget -q --show-progress -O $src_filename $src_url)
 	fi
 
 	# Check the control sum
-    echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \
+	echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status ||
-        || ynh_die "Corrupt source"
+		ynh_die "Corrupt source"
 
 	ynh_print_info "Installing Gitlab..."
 	#Fix for the CI
-    if sudo grep -qa container=lxc /proc/1/environ;
+	if sudo grep -qa container=lxc /proc/1/environ; then
-    then
 		dpkg -i $src_filename || true # This command will fail in lxc env
 		sed -i 's/command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf  | sysctl -e -p -\"/command \"cat \/etc\/sysctl.conf\"/g' $final_path/embedded/cookbooks/package/resources/sysctl.rb
 		dpkg --configure gitlab-ce || true
 	else
 		dpkg -i $src_filename || true
-    fi;
+	fi
 }
 
 #=================================================
@@ -140,8 +138,7 @@ waiting_to_start() {
 
 	log_path="/var/log/gitlab/unicorn/current"
 
-    if [ ! -f "$log_path" ]
+	if [ ! -f "$log_path" ]; then
-    then
 		return 0
 	fi
 
@@ -156,14 +153,12 @@ waiting_to_start() {
 
 	# Following the starting of the app in its log
 	local templog="$(mktemp)"
-    tail -F -n1 "$log_path" > "$templog" &
+	tail -F -n1 "$log_path" >"$templog" &
 	# get the PID of the tail command
 	local pid_tail=$!
 
-    for i in $(seq 1 500)
+	for i in $(seq 1 500); do
-    do
+		if grep --quiet "${line_match_new}" $templog || grep --quiet "${line_match_existing}" $templog; then
-        if grep --quiet "${line_match_new}" $templog || grep --quiet "${line_match_existing}" $templog
-        then
 			echo "Gitlab has correctly started." >&2
 			break
 		fi

scripts/backup

@@ -16,7 +16,7 @@ source ../settings/scripts/_common.sh
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
+ynh_clean_setup() {
 
 	rm /var/opt/gitlab/backups/*_gitlab_backup.tar
 	true

scripts/change_url

@@ -51,14 +51,12 @@ path_url="$new_path"
 #=================================================
 
 change_domain=0
-if [ "$old_domain" != "$new_domain" ]
+if [ "$old_domain" != "$new_domain" ]; then
-then
 	change_domain=1
 fi
 
 change_path=0
-if [ "$old_path" != "$new_path" ]
+if [ "$old_path" != "$new_path" ]; then
-then
 	change_path=1
 fi
 
@@ -73,8 +71,7 @@ fi
 # Gitlab configuration
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-if [ $change_path -eq 1 ]
+if [ $change_path -eq 1 ]; then
-then
 	ynh_print_info "Changing path..."
 
 	sudo gitlab-ctl stop unicorn
@@ -90,8 +87,7 @@ then
 fi
 
 # Change the domain for nginx
-if [ $change_domain -eq 1 ]
+if [ $change_domain -eq 1 ]; then
-then
 	ynh_print_info "Changing domain..."
 
 	# Delete file checksum for the old conf file location
@@ -109,8 +105,7 @@ config_gitlab
 
 sudo gitlab-ctl reconfigure
 
-if [ $change_path -eq 1 ]
+if [ $change_path -eq 1 ]; then
-then
 	sudo gitlab-ctl restart
 	sudo gitlab-ctl restart unicorn
 fi

scripts/install

@@ -40,8 +40,8 @@ ynh_webpath_register $app $domain $path_url
 #=================================================
 
 # Check user parameter
-ynh_user_exists "$admin" \
+ynh_user_exists "$admin" ||
-  || ynh_die "The chosen admin user does not exist."
+	ynh_die "The chosen admin user does not exist."
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST

scripts/remove

@@ -61,14 +61,12 @@ ynh_secure_remove "/var/log/$app"
 # CLOSE PORTS
 #=================================================
 
-if yunohost firewall list | grep -q "\- $port$"
+if yunohost firewall list | grep -q "\- $port$"; then
-then
 	echo "Close port $port" >&2
 	yunohost firewall disallow TCP $port 2>&1
 fi
 
-if yunohost firewall list | grep -q "\- $portUnicorn$"
+if yunohost firewall list | grep -q "\- $portUnicorn$"; then
-then
 	echo "Close port $portUnicorn" >&2
 	yunohost firewall disallow TCP $portUnicorn 2>&1
 fi

scripts/restore

@@ -29,7 +29,7 @@ source _common.sh
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
+ynh_clean_setup() {
 
 	rm /var/opt/gitlab/backups/*_gitlab_backup.tar
 	true
@@ -47,10 +47,10 @@ path_url=$(ynh_app_setting_get "$app" path_url)
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
 
-ynh_webpath_available $domain $path_url \
+ynh_webpath_available $domain $path_url ||
-|| ynh_die "Path not available: ${domain}${path_url}"
+	ynh_die "Path not available: ${domain}${path_url}"
-test ! -d $final_path \
+test ! -d $final_path ||
-|| ynh_die "There is already a directory: $final_path "
+	ynh_die "There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS

scripts/upgrade

@@ -32,7 +32,7 @@ portUnicorn=$(ynh_app_setting_get "$app" unicorn_port)
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
-ynh_clean_setup () {
+ynh_clean_setup() {
 	# restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }