Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix config and logs #111

Merged
merged 16 commits into from
Nov 15, 2023
Merged

Fix config and logs #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9aee98f
Generic refactoring
AlexPresso Nov 10, 2023
88d718f
Fix lint
AlexPresso Nov 10, 2023
4ef4f99
Fix lint
AlexPresso Nov 10, 2023
e85f6e7
Continue refactor
AlexPresso Nov 10, 2023
bf88223
Continue refactoring
AlexPresso Nov 10, 2023
dd4fa82
Continue refactor
AlexPresso Nov 10, 2023
42e5303
Continue refactor
AlexPresso Nov 10, 2023
2970c73
Continue refactor
AlexPresso Nov 10, 2023
2c128ac
Improve source error message
AlexPresso Nov 10, 2023
0e91590
Improve patch_utils
AlexPresso Nov 10, 2023
d776541
Fix lint
AlexPresso Nov 10, 2023
c8c66c2
Update motd
AlexPresso Nov 10, 2023
a6e289b
Set Gstreamer library path
AlexPresso Nov 10, 2023
bc1dda6
Fix config load and load error log
AlexPresso Nov 14, 2023
0cdb48d
Merge branch 'main' of https://github.com/AlexPresso/VideoStation-FFM…
AlexPresso Nov 14, 2023
49e7ef8
Add file load check in issue_report
AlexPresso Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions issue-report.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 10 additions & 5 deletions wrappers/ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
#########################
Expand Down
2 changes: 1 addition & 1 deletion wrappers/gst-inspect-1.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wrappers/gst-launch-1.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down