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

Merge branch 'update_do_debian_release' into storageareas

This commit is contained in:
Isaac Connor 2017-04-26 16:03:46 -04:00
parent 20345df3eb b2fc959a50
commit 01c4242d2d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/installationguide/ubuntu.rst
View File

@ -287,19 +287,19 @@ To build the latest master snapshot:
:: ::
./do_debian_package.sh `lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'` `date +%Y%m%d`01 local master ./do_debian_package.sh --snapshot=NOW --branch=master --type=local
To build the latest stable release: To build the latest stable release:
:: ::
./do_debian_package.sh `lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'` `date +%Y%m%d`01 local stable ./do_debian_package.sh --snapshot=stable --type=local
Note that the ``lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`` Note that the distribution will be guessed using ``lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'``
part simply extracts your distribution name - like "vivid", "trusty" etc. You which simply extracts your distribution name - like "vivid", "trusty" etc. You
can always replace it by your distro name if you know it. As far as the script can always specify it using --distro=your distro name if you know it. As far as the script
goes, it checks if your distro is "trusty" in which case it pulls in pre-systemd goes, it checks if your distro is "trusty" in which case it pulls in pre-systemd
release configurations and if its not "trusty" it assumes its based on systemd release configurations and if its not "trusty" it assumes its based on systemd
and pulls in systemd related config files. and pulls in systemd related config files.

5
utils/do_debian_package.sh
View File

@ -63,6 +63,11 @@ if [ "$TYPE" == "" ]; then
TYPE="source"; TYPE="source";
fi; fi;
if [ "$DISTRO" == "" ]; then
DISTRO=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
echo "Defaulting to $DISTRO for distribution";
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