| 
					
				 | 
			
			
				@@ -3,17 +3,18 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 create_socat_links() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # Bind linked docker container to localhost socket using socat 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     USED_PORT="3000:22" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    while read NAME ADDR PORT; do 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    while read -r NAME ADDR PORT; do 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if test -z "$NAME$ADDR$PORT"; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             continue 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         elif echo $USED_PORT | grep -E "(^|:)$PORT($|:)" > /dev/null; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             echo "init:socat  | Can't bind linked container ${NAME} to localhost, port ${PORT} already in use" 1>&2 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             SERV_FOLDER=/app/gogs/docker/s6/SOCAT_${NAME}_${PORT} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            mkdir -p ${SERV_FOLDER} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            mkdir -p "${SERV_FOLDER}" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             CMD="socat -ls TCP4-LISTEN:${PORT},fork,reuseaddr TCP4:${ADDR}:${PORT}" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            echo -e "#!/bin/sh\nexec $CMD" > ${SERV_FOLDER}/run 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            chmod +x ${SERV_FOLDER}/run 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            # shellcheck disable=SC2039 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            echo -e "#!/bin/sh\nexec $CMD" > "${SERV_FOLDER}"/run 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            chmod +x "${SERV_FOLDER}"/run 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             USED_PORT="${USED_PORT}:${PORT}" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             echo "init:socat  | Linked container ${NAME} will be binded to localhost on port ${PORT}" 1>&2 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         fi 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -25,18 +26,18 @@ EOT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 cleanup() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # Cleanup SOCAT services and s6 event folder 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # On start and on shutdown in case container has been killed 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    rm -rf $(find /app/gogs/docker/s6/ -name 'event') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    rm -rf "$(find /app/gogs/docker/s6/ -name 'event')" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     rm -rf /app/gogs/docker/s6/SOCAT_* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 create_volume_subfolder() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # Modify the owner of /data dir, make $USER(git) user have permission to create sub-dir in /data. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    chown -R $USER:$USER /data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    chown -R "$USER:$USER" /data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # Create VOLUME subfolder 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     for f in /data/gogs/data /data/gogs/conf /data/gogs/log /data/git /data/ssh; do 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ! test -d $f; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            gosu $USER mkdir -p $f 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            gosu "$USER" mkdir -p $f 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         fi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     done 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -54,14 +55,14 @@ cleanup 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 create_volume_subfolder 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 LINK=$(echo "$SOCAT_LINK" | tr '[:upper:]' '[:lower:]') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-if [ "$LINK" = "false" -o "$LINK" = "0" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+if [ "$LINK" = "false" ] || [ "$LINK" = "0" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     echo "init:socat  | Will not try to create socat links as requested" 1>&2 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     create_socat_links 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 fi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 CROND=$(echo "$RUN_CROND" | tr '[:upper:]' '[:lower:]') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-if [ "$CROND" = "true" -o "$CROND" = "1" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+if [ "$CROND" = "true" ] || [ "$CROND" = "1" ]; then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     echo "init:crond  | Cron Daemon (crond) will be run as requested by s6" 1>&2 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     rm -f /app/gogs/docker/s6/crond/down 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /bin/sh /app/gogs/docker/runtime/backup-init.sh "${PUID}" 
			 |