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

add extra quotes where neccessary, fix the release case

This commit is contained in:
Isaac Connor 2017-04-12 16:20:04 -04:00
parent 4215f227da
commit c9482d8ae8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/do_debian_package.sh
View File

@ -62,21 +62,23 @@ if [ "$TYPE" == "" ]; then
echo "Defaulting to source build" echo "Defaulting to source build"
TYPE="source"; TYPE="source";
fi; fi;
if [ "$GITHUB_FORK" == "" ]; then
echo "Defaulting to ZoneMinder upstream git"
GITHUB_FORK="ZoneMinder"
fi;
# Release is a special mode... it uploads to the release ppa and cannot have a snapshot # Release is a special mode... it uploads to the release ppa and cannot have a snapshot
if [ "$RELEASE" != "" ]; then if [ "$RELEASE" != "" ]; then
if [ "$SNAPSHOT" != "" ]; then if [ "$SNAPSHOT" != "" ]; then
echo "Releases cannot have a snapshot.... exiting." echo "Releases cannot have a snapshot.... exiting."
exit 0;
fi fi
if [ "$GITHUB_FORK" != "" ]; then if [ "$GITHUB_FORK" != "" ] && [ "$GITHUB_FORK" != "ZoneMinder" ]; then
echo "Releases cannot have a fork.... exiting." echo "Releases cannot have a fork ($GITHUB_FORK).... exiting."
exit 0;
fi fi
BRANCH=$RELEASE BRANCH="release-$RELEASE"
else else
if [ "$GITHUB_FORK" == "" ]; then
echo "Defaulting to ZoneMinder upstream git"
GITHUB_FORK="ZoneMinder"
fi;
if [ "$SNAPSHOT" == "stable" ]; then if [ "$SNAPSHOT" == "stable" ]; then
if [ "$BRANCH" == "" ]; then if [ "$BRANCH" == "" ]; then
BRANCH=$(git describe --tags $(git rev-list --tags --max-count=1)); BRANCH=$(git describe --tags $(git rev-list --tags --max-count=1));
@ -99,6 +101,8 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
if [ -d "${GITHUB_FORK}_ZoneMinder.git" ]; then if [ -d "${GITHUB_FORK}_ZoneMinder.git" ]; then
echo "Using local clone ${GITHUB_FORK}_ZoneMinder.git to pull from." echo "Using local clone ${GITHUB_FORK}_ZoneMinder.git to pull from."
cd "${GITHUB_FORK}_ZoneMinder.git" cd "${GITHUB_FORK}_ZoneMinder.git"
echo "git pull..."
git pull
echo "git checkout $BRANCH" echo "git checkout $BRANCH"
git checkout $BRANCH git checkout $BRANCH
echo "git pull..." echo "git pull..."
@ -139,10 +143,10 @@ cd "$DIRECTORY.orig";
git submodule init git submodule init
git submodule update --init --recursive git submodule update --init --recursive
if [ $DISTRO == "trusty" ] || [ $DISTRO == "precise" ]; then if [ "$DISTRO" == "trusty" ] || [ "$DISTRO" == "precise" ]; then
ln -sf distros/ubuntu1204 debian ln -sf distros/ubuntu1204 debian
else else
if [ $DISTRO == "wheezy" ]; then if [ "$DISTRO" == "wheezy" ]; then
ln -sf distros/debian debian ln -sf distros/debian debian
else else
ln -sf distros/ubuntu1604 debian ln -sf distros/ubuntu1604 debian