Continue refactor

patcher.sh

@@ -20,7 +20,6 @@ wrappers=(
 vs_base_path=/var/packages/VideoStation
 vs_path="$vs_base_path/target"
 libsynovte_path="$vs_path/lib/libsynovte.so"
-vs_scripts=("preuninst")
 cp_base_path=/var/packages/CodecPack
 cp_path="$cp_base_path/target"
 cp_bin_path="$cp_path/bin"

utils/patch_utils.sh

@@ -1,13 +1,17 @@
 #!/bin/bash
 
+stderrfile=/dev/null
+child=""
+pid=""
+
 log() {
   local now
   now=$(date '+%Y-%m-%d %H:%M:%S')
-  echo "[$now] [$1] $2" >> $stderrfile
+  echo "[$now] [$1] $2" >> "$stderrfile"
 }
 
 newline() {
-  echo "" >> $stderrfile
+  echo "" >> "$stderrfile"
 }
 
 info() {
@@ -31,7 +35,7 @@ endprocess() {
   kill_child
   rm -f "$stderrfile"
 
-  exit $errcode
+  exit "$errcode"
 }
 
 handle_error() {

wrappers/ffmpeg.sh

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# shellcheck source=/utils/patch_config.sh
+source "/var/packages/VideoStation/patch/patch_config.sh" 2> /dev/null ||
+source "/var/packages/CodecPack/patch/patch_config.sh" 2> /dev/null
+
+# shellcheck source=/utils/patch_utils.sh
+source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
+source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
+{ echo "Cannot load patch_utils.sh" >> "$stderrfile.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
+
 #########################
 # VARS
 #########################
@@ -12,19 +21,6 @@ errcode=0
 path=$(realpath "$0")
 args=()
 
-#########################
-# UTILS
-#########################
-
-# shellcheck source=/utils/patch_config.sh
-source "/var/packages/VideoStation/patch/patch_config.sh" 2> /dev/null ||
-source "/var/packages/CodecPack/patch/patch_config.sh" 2> /dev/null
-
-# shellcheck source=/utils/patch_utils.sh
-source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
-source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
-{ echo "Cannot load patch_utils.sh" >> "$stderrfile.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
-
 #########################
 # ENTRYPOINT
 #########################

wrappers/gst-inspect-1.0.sh

@@ -2,6 +2,11 @@
 
 export GST_DEBUG=1 #1: ERROR (Log fatal errors only).
 
+# shellcheck source=/utils/patch_utils.sh
+source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
+source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
+{ echo "Cannot load patch_utils.sh" >> "$stderrfile.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
+
 #########################
 # VARS
 #########################
@@ -12,15 +17,6 @@ stderrfile="/tmp/gstinspect-$pid.stderr"
 path=$(realpath "$0")
 errcode=0
 
-#########################
-# UTILS
-#########################
-
-# shellcheck source=/utils/patch_utils.sh
-source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
-source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
-{ echo "Cannot load patch_utils.sh" >> "$stderrfile.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
-
 #########################
 # ENTRYPOINT
 #########################

wrappers/gst-launch-1.0.sh

@@ -2,6 +2,11 @@
 
 export GST_DEBUG=1 #1: ERROR (Log fatal errors only).
 
+# shellcheck source=/utils/patch_utils.sh
+source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
+source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
+{ echo "Cannot load patch_utils.sh" >> "$stderrfile.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
+
 #########################
 # VARS
 #########################
@@ -12,15 +17,6 @@ stderrfile="/tmp/gstlaunch-$pid.stderr"
 path=$(realpath "$0")
 errcode=0
 
-#########################
-# UTILS
-#########################
-
-# shellcheck source=/utils/patch_utils.sh
-source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
-source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
-{ echo "Cannot load patch_utils.sh" >> "$stderrfile.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
-
 #########################
 # ENTRYPOINT
 #########################