Merge branch 'master' of github.com:connortechnology/ZoneMinder
This commit is contained in:
commit
3d2f806699
|
@ -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,20 +124,21 @@ 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
|
||||||
PPA="ppa:iconnor/zoneminder-stable"
|
PPA="ppa:iconnor/zoneminder-stable"
|
||||||
|
else
|
||||||
|
PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
|
||||||
|
fi;
|
||||||
else
|
else
|
||||||
PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
|
if [ "$BRANCH" == "" ]; then
|
||||||
fi;
|
PPA="ppa:iconnor/zoneminder-master";
|
||||||
else
|
else
|
||||||
if [ "$BRANCH" == "" ]; then
|
PPA="ppa:iconnor/zoneminder-$BRANCH";
|
||||||
PPA="ppa:iconnor/zoneminder-master";
|
fi;
|
||||||
else
|
|
||||||
PPA="ppa:iconnor/zoneminder-$BRANCH";
|
|
||||||
fi;
|
fi;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
@ -327,7 +332,8 @@ EOF
|
||||||
dput $PPA $SC
|
dput $PPA $SC
|
||||||
fi;
|
fi;
|
||||||
else
|
else
|
||||||
dput $PPA $SC
|
echo "dputting to $PPA";
|
||||||
|
dput $PPA $SC
|
||||||
fi;
|
fi;
|
||||||
fi;
|
fi;
|
||||||
done; # foreach distro
|
done; # foreach distro
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue