Merge pull request #4094 from AllskyTeam/master

Merge changes from Master

.github/workflows/ci_shellcheck.yml

@@ -7,8 +7,8 @@ on:
   push:
     paths:
       - '*.sh'
-      - '*/*.sh'
-      - '*/*/*.sh'
+      - 'scripts/*.sh'
+      - 'scripts/utilities/*.sh'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -27,7 +27,7 @@ jobs:
         run: |
           # check bash files (bash -n, shellcheck -x)
           err=0
-          for i in $(find . -maxdepth 2 -name '*.sh'); do
+          for i in $(find . -maxdepth 3 -name '*.sh'); do
             echo "==================== $i"
             bash -n $i
             if [ $? -ne 0 ]; then

scripts/checkAllsky.sh

@@ -868,4 +868,4 @@ else
 	fi
 fi
 
-exit ${RET}
+exit "${RET}"

scripts/generateForDay.sh

@@ -183,14 +183,14 @@ if [[ ${TYPE} == "GENERATE" ]]; then
 		[[ -n ${DEBUG_ARG} ]] && echo "${ME}: Executing: ${CMD}"
 		# shellcheck disable=SC2086
 		eval ${CMD}
-		RET=$?
+		local RET=$?
 		if [[ ${RET} -ne 0 ]]; then
 			echo -e "${RED}${ME}: Command Failed: ${CMD}${NC}"
 		elif [[ ${SILENT} == "false" ]]; then
 			echo -e "\tDone"
 		fi
 
-		return ${RET}
+		return "${RET}"
 	}
 
 else

scripts/installUpgradeFunctions.sh

@@ -500,11 +500,11 @@ function replace_website_placeholders()
 			MINI_TLAPSE_URL_VALUE=""
 		else
 			MINI_TLAPSE_DISPLAY_VALUE="true"
-			if [[ ${DO_REMOTE_WEBSITE} == "true" ]]; then
-				MINI_TLAPSE_URL_VALUE="mini-timelapse.mp4"
-			else
+			if [[ ${TYPE} == "local" ]]; then
 				#shellcheck disable=SC2153
 				MINI_TLAPSE_URL_VALUE="/${IMG_DIR}/mini-timelapse.mp4"
+			else
+				MINI_TLAPSE_URL_VALUE="mini-timelapse.mp4"
 			fi
 		fi
 	else
@@ -605,9 +605,9 @@ function replace_website_placeholders()
 		config.camera				"camera"			"${CAMERA}" \
 		config.lens					"lens"				"${LENS}" \
 		config.computer				"computer"			"${COMPUTER}" \
-		config.AllskyVersion		"AllskyVersion"		"${ALLSKY_VERSION}" \
-		${MINI_TLAPSE_DISPLAY}		"mini_display"		"${MINI_TLAPSE_DISPLAY_VALUE}" \
-		${MINI_TLAPSE_URL}			"mini_url"			"${MINI_TLAPSE_URL_VALUE}"
+		"${WEBSITE_ALLSKY_VERSION}"	"AllskyVersion"		"${ALLSKY_VERSION}" \
+		"${MINI_TLAPSE_DISPLAY}"	"mini_display"		"${MINI_TLAPSE_DISPLAY_VALUE}" \
+		"${MINI_TLAPSE_URL}"		"mini_url"			"${MINI_TLAPSE_URL_VALUE}"
 }
 
 

scripts/postData.sh

@@ -83,7 +83,7 @@ while [[ $# -gt 0 ]]; do
 	esac
 	shift
 done
-[[ ${RET} -ne 0 ]] && usage_and_exit ${RET}
+[[ ${RET} -ne 0 ]] && usage_and_exit "${RET}"
 [[ ${HELP} == "true" ]] && usage_and_exit 0
 
 

scripts/postToMap.sh

@@ -73,7 +73,7 @@ function check_URL()
 
 	else
 		# Make sure it's a valid URL.  Some servers don't return anything if the user agent is "curl".
-		local CONTENT="$( curl --user-agent Allsky --location --head --silent --show-error --connect-timeout ${TIMEOUT} "${URL}" 2>&1 )"
+		local CONTENT="$( curl --user-agent Allsky --location --head --silent --show-error --connect-timeout "${TIMEOUT}" "${URL}" 2>&1 )"
 		local RET=$?
 		if [[ ${DEBUG} == "true" ]]; then
 			echo -e "\n${wDEBUG}"
@@ -356,7 +356,7 @@ if [[ ${UPLOAD} == "true" ]]; then
 		else
 			echo -e "${ERROR_MSG_START}${E}${wNC}"
 		fi
-		exit ${RETURN_CODE}
+		exit "${RETURN_CODE}"
 	fi
 
 	# Get the return string from the server.  It's the last line of output.

scripts/saveImage.sh

@@ -363,7 +363,7 @@ if [[ ${SAVE_IMAGE} == "true" ]]; then
 				# Remove the oldest files if we haven't reached the limit.
 				if [[ ${LEFT} -le 0 ]]; then
 					KEEP=$((TIMELAPSE_MINI_IMAGES - TIMELAPSE_MINI_FREQUENCY))
-					x="$( tail -${KEEP} "${MINI_TIMELAPSE_FILES}" )"
+					x="$( tail "-${KEEP}" "${MINI_TIMELAPSE_FILES}" )"
 					echo -e "${x}" > "${MINI_TIMELAPSE_FILES}"
 					if [[ ${ALLSKY_DEBUG_LEVEL} -ge 3 ]]; then
 						echo -en "${YELLOW}${ME}: Replaced ${TIMELAPSE_MINI_FREQUENCY} oldest, LEFT=$LEFT, KEEP=$KEEP"

scripts/testUpload.sh

@@ -302,4 +302,4 @@ if [[ -s ${MSG_FILE} ]]; then
 fi
 rm -f "${MSG_FILE}"
 
-exit ${RET}
+exit "${RET}"

scripts/utilities/allsky-config.sh

@@ -42,6 +42,7 @@ while [[ $# -gt 0 ]]; do
 		*)
 			CMD="${ARG}"
 			shift
+			# shellcheck disable=SC2124
 			CMD_ARGS="${@}"
 			break;
 			;;
@@ -84,6 +85,7 @@ PATH="${PATH}:${ALLSKY_UTILITIES}"
 # Show all the supported cameras.
 function show_supported_cameras()
 {
+	# shellcheck disable=SC2124
 	local ARGS="${@}"
 
 	#shellcheck disable=SC2086
@@ -98,7 +100,7 @@ function show_supported_cameras()
 		ARGS="$( prompt "${PROMPT}" "${OPTS[@]}" )"
 	fi
 
-	#shellcheck disable=SC2086
+	# shellcheck disable=SC2086
 	show_supported_cameras.sh ${ARGS}
 }
 
@@ -114,10 +116,13 @@ function show_connected_cameras()
 	else
 		local FORMAT="%-6s %-8s %s\n"
 		echo
+		# shellcheck disable=SC2059
 		printf "${FORMAT}" "Type" "Number" "Model"
+		# shellcheck disable=SC2059
 		printf "${FORMAT}" "====" "======" "====="
 		echo -e "${CAMERAS}" | while read -r TYPE NUM MODEL
 			do
+				# shellcheck disable=SC2059
 				printf "${FORMAT}" "${TYPE}" "${NUM}" "${MODEL}"
 			done
 	fi
@@ -127,9 +132,10 @@ function show_connected_cameras()
 # Show all the currently connected cameras.
 function new_rpi_camera_info()
 {
+	# shellcheck disable=SC2124
 	local ARGS="${@}"		# optional
 
-	#shellcheck disable=SC2086
+	# shellcheck disable=SC2086
 	get_RPi_camera_info.sh ${ARGS}
 }
 
@@ -232,6 +238,7 @@ function run_command()
 {
 	COMMAND="${1}"
 	shift
+	# shellcheck disable=SC2124
 	ARGUMENTS="${@}"
 	if ! type "${COMMAND}" > /dev/null 2>&1 ; then
 		echo -e "\n${RED}${ME}: Unknown command '${COMMAND}'.${NC}" >&2
@@ -268,7 +275,7 @@ function prompt()
 		exit 2
 	else
 		echo "${OPT}"
-		return ${RET}
+		return "${RET}"
 	fi
 }
 
@@ -294,7 +301,7 @@ if [[ -z ${CMD} ]]; then
 		run_command "${COMMAND}"
 		RET=$?
 
-		[[ ${ALLOW_MORE_COMMANDS} == "false" ]] && exit ${RET}
+		[[ ${ALLOW_MORE_COMMANDS} == "false" ]] && exit "${RET}"
 		while true; do
 			echo -e "\n\n"
 			echo -e "${YELLOW}${BOLD}"

scripts/utilities/installSamba.sh

@@ -75,6 +75,7 @@ echo
 echo -en "${BOLD}"
 echo    "============================================="
 echo -n "Press RETURN to continue with installation: "
+# shellcheck disable=SC2034
 read -r x
 echo -e "${NC}"