@@ -212,13 +212,15 @@ genesis_juicer() {
212212
213213 SAVE_PATH=" $( echo " ${SAVE_PATH} " | sed " s|^~/|${HOME} /|" ) "
214214 LOG_PATH=" $( echo " ${LOG_PATH} " | sed " s|^~/|${HOME} /|" ) "
215- SAVE_PATH=$( realpath -m " ${SAVE_PATH} " 2> /dev/null)
215+ _SAVE_PATH=$( realpath -m " ${SAVE_PATH} " 2> /dev/null)
216+ [ -n " ${_SAVE_PATH} " ] && SAVE_PATH=${_SAVE_PATH}
216217 [ " ${LOG_PATH} " = 0 ] && {
217218 LOG_PATH=" "
218219 WATCHDOG_LOGFILE=" /dev/null"
219220 FFMPEG_LOGFILE=" /dev/null"
220221 } || {
221- LOG_PATH=$( realpath -m " ${LOG_PATH} " 2> /dev/null)
222+ _LOG_PATH=$( realpath -m " ${LOG_PATH} " 2> /dev/null)
223+ [ -n " ${_LOG_PATH} " ] && LOG_PATH=${_LOG_PATH}
222224 WATCHDOG_LOGFILE=" ${LOG_PATH} /${MODEL} -${PLATFORM} .log"
223225 FFMPEG_LOGFILE=" ${LOG_PATH} /${MODEL} -${PLATFORM} .ffmpeg.log"
224226 }
@@ -283,7 +285,12 @@ utils() {
283285 # Check if version is met and return value: `utils check_ffmpeg_ver "[VERSION CODE]"`
284286 check_ffmpeg_ver)
285287 local CUR_VER_RAW=" $( ffmpeg -version 2> /dev/null | head -n 1 | tr -s ' [:space:]' ' ' | cut -d ' ' -f3) "
286- local CUR_VER=" $( case ${CUR_VER_RAW} in [! 0-9][0-9]* ) echo " ${CUR_VER_RAW# ?} " ;; *) echo " ${CUR_VER_RAW} " ;; esac)"
288+
289+ case ${CUR_VER_RAW} in
290+ [!0-9][0-9]* ) local CUR_VER=" ${CUR_VER_RAW# ?} " ;;
291+ * ) local CUR_VER=" ${CUR_VER_RAW} " ;;
292+ esac
293+
287294 [ -n " $2 " ] && {
288295 local TAR_VER=" $2 "
289296 [ " ${CUR_VER} " = " ${TAR_VER} " ] && return 0
@@ -315,7 +322,7 @@ utils() {
315322 timemark_exec)
316323 local TIME_MARK=" [$( date " +%Y%m%d-%H%M%S" ) ] "
317324 local RAW=" $( eval " $2 " 2>&1 ; printf " \n$? " ) "
318- local OUTPUT=" $( echo " ${RAW} " | head -n -1 ) "
325+ local OUTPUT=" $( echo " ${RAW} " | sed ' $d ' ) "
319326 [ -z " ${OUTPUT} " ] && return 0
320327 local EXEC_STAT=" $( echo " ${RAW} " | tail -n 1) "
321328 echo " ${OUTPUT} " | sed " s|^|${TIME_MARK} |"
0 commit comments