Fix config and logs (#111)

* Fix config load and load error log
AlexPresso · Nov 15, 2023 · 76401bd · 76401bd
1 parent 610cb3f
commit 76401bd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/issue-report.sh b/issue-report.sh
@@ -1,14 +1,24 @@
 #!/bin/bash
 
 ###############################
-# VARS
+# VARS + EXTERNAL FILES
 ###############################
 
 ffmpeg_version=ffmpeg
+
 # shellcheck source=/.github/workflows/mock/VERSION
 source "/etc/VERSION"
+
 # shellcheck source=/utils/patch_config.sh
-source "/var/packages/VideoStation/patch_config.sh" || echo "No patch_config.sh"
+source "/var/packages/VideoStation/patch/patch_utils.sh" 2> /dev/null ||
+source "/var/packages/CodecPack/patch/patch_utils.sh" 2> /dev/null ||
+echo "No patch_config.sh"
+
+# 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 ||
+echo "No patch_utils.sh"
+
 dsm_version="$productversion $buildnumber-$smallfixnumber"
 vs_path=/var/packages/VideoStation
 cp_path=/var/packages/CodecPack

diff --git a/wrappers/ffmpeg.sh b/wrappers/ffmpeg.sh
@@ -1,13 +1,9 @@
 #!/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" >> "ffmpeg-0.stderr.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
+{ echo "Cannot load patch_utils.sh" >> "/tmp/ffmpeg-0.stderr.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
 
 #########################
 # VARS
@@ -21,6 +17,15 @@ errcode=0
 path=$(realpath "$0")
 args=()
 
+#########################
+# LOAD CONFIG
+#########################
+
+# 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 ||
+{ echo "Cannot load patch_config.sh" >> "/tmp/ffmpeg-0.stderr.prev" && echo "Cannot load patch_config.sh" && exit 1; }
+
 #########################
 # ENTRYPOINT
 #########################

diff --git a/wrappers/gst-inspect-1.0.sh b/wrappers/gst-inspect-1.0.sh
@@ -5,7 +5,7 @@ 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" >> "gstinspect-0.stderr.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
+{ echo "Cannot load patch_utils.sh" >> "/tmp/gstinspect-0.stderr.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
 
 #########################
 # VARS

diff --git a/wrappers/gst-launch-1.0.sh b/wrappers/gst-launch-1.0.sh
@@ -6,7 +6,7 @@ export LD_LIBRARY_PATH=/var/packages/@package_name@/target/lib/gstreamer/patch
 # 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" >> "gstlaunch-0.stderr.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
+{ echo "Cannot load patch_utils.sh" >> "/tmp/gstlaunch-0.stderr.prev" && echo "Cannot load patch_utils.sh" && exit 1; }
 
 #########################
 # VARS