From 0470db036914a94acb4b6f74157c5259d142d800 Mon Sep 17 00:00:00 2001 From: dinkypumpkin Date: Mon, 29 Jun 2020 15:43:07 +0100 Subject: [PATCH] fixed utils path --- Makefile | 4 +++- get_iplayer | 2 +- get_iplayer_cgi | 2 +- get_iplayer_pvr | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4965811..06f831f 100644 --- a/Makefile +++ b/Makefile @@ -584,13 +584,15 @@ endif commit: ifndef WIP +ifneq ($(pkg_ver), $(curr_version)) @/usr/libexec/PlistBuddy -c "Set :PACKAGES:0:PACKAGE_SETTINGS:VERSION $(pkg_ver)" $(pkg_src) @git commit -m $(pkg_ver) $(pkg_src) +endif @git tag $(pkg_ver) @git checkout contribute @git merge master @/usr/libexec/PlistBuddy -c "Set :PACKAGES:0:PACKAGE_SETTINGS:VERSION $(next_version)" $(pkg_src) - @git commit -m "bump dev version" $(pkg_src) + @git commit -m $(next_version) $(pkg_src) @git checkout master @echo tagged $(pkg_ver) endif diff --git a/get_iplayer b/get_iplayer index 9eec05d..f0e819f 100755 --- a/get_iplayer +++ b/get_iplayer @@ -1,5 +1,5 @@ #!/bin/bash GIPDIR=/usr/local/get_iplayer GIPCLI=$GIPDIR/perl/bin/get_iplayer -export PATH="$GIPDIR/bin${PATH:+:${PATH}}" +export PATH="$GIPDIR/utils/bin${PATH:+:${PATH}}" exec $GIPCLI "$@" diff --git a/get_iplayer_cgi b/get_iplayer_cgi index 96bab71..629b0a5 100755 --- a/get_iplayer_cgi +++ b/get_iplayer_cgi @@ -2,5 +2,5 @@ GIPDIR=/usr/local/get_iplayer GIPCLI=$GIPDIR/perl/bin/get_iplayer GIPWPM=$GIPDIR/perl/bin/get_iplayer.cgi -export PATH="$GIPDIR/bin${PATH:+:${PATH}}" +export PATH="$GIPDIR/utils/bin${PATH:+:${PATH}}" exec $GIPWPM --getiplayer $GIPCLI --listen 127.0.0.1 --port 1935 "$@" diff --git a/get_iplayer_pvr b/get_iplayer_pvr index efb5358..ebe5152 100755 --- a/get_iplayer_pvr +++ b/get_iplayer_pvr @@ -1,5 +1,5 @@ #!/bin/bash GIPDIR=/usr/local/get_iplayer GIPCLI=$GIPDIR/perl/bin/get_iplayer -export PATH="$GIPDIR/bin${PATH:+:${PATH}}" +export PATH="$GIPDIR/utils/bin${PATH:+:${PATH}}" exec $GIPCLI --pvr-scheduler 14400 "$@"