ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:connortechnology/ZoneMinder

This commit is contained in:
Isaac Connor 2019-06-25 16:32:38 -04:00
parent c3135accbb 8cf7563ce4
commit c290170878
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/do_debian_package.sh
View File

@ -30,6 +30,10 @@ case $i in
INTERACTIVE="${i#*=}" INTERACTIVE="${i#*=}"
shift # past argument=value shift # past argument=value
;; ;;
-p=*|--ppa=*)
PPA="${i#*=}"
shift # past argument=value
;;
-r=*|--release=*) -r=*|--release=*)
RELEASE="${i#*=}" RELEASE="${i#*=}"
shift shift
@ -120,8 +124,8 @@ else
fi; fi;
fi fi
PPA=""; if [ "$PPA" == "" ]; then
if [ "$RELEASE" != "" ]; then if [ "$RELEASE" != "" ]; then
# We need to use our official tarball for the original source, so grab it and overwrite our generated one. # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
IFS='.' read -r -a VERSION <<< "$RELEASE" IFS='.' read -r -a VERSION <<< "$RELEASE"
if [ "${VERSION[0]}.${VERSION[1]}" == "1.30" ]; then if [ "${VERSION[0]}.${VERSION[1]}" == "1.30" ]; then
@ -129,12 +133,13 @@ if [ "$RELEASE" != "" ]; then
else else
PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}" PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
fi; fi;
else else
if [ "$BRANCH" == "" ]; then if [ "$BRANCH" == "" ]; then
PPA="ppa:iconnor/zoneminder-master"; PPA="ppa:iconnor/zoneminder-master";
else else
PPA="ppa:iconnor/zoneminder-$BRANCH"; PPA="ppa:iconnor/zoneminder-$BRANCH";
fi; fi;
fi;
fi; fi;
# Instead of cloning from github each time, if we have a fork lying around, update it and pull from there instead. # Instead of cloning from github each time, if we have a fork lying around, update it and pull from there instead.
@ -327,6 +332,7 @@ EOF
dput $PPA $SC dput $PPA $SC
fi; fi;
else else
echo "dputting to $PPA";
dput $PPA $SC dput $PPA $SC
fi; fi;
fi; fi;
@ -339,5 +345,3 @@ if [ "$INTERACTIVE" != "no" ]; then
else else
rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted"; rm -fr "$DIRECTORY.orig"; echo "The checked out copy has been deleted";
fi fi