From 5cb8c40f3360b6302a339be8b310f2b1fd2c41fa Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Thu, 1 Dec 2016 01:51:04 +0100
Subject: [PATCH] =?UTF-8?q?Version=20auf=202016.2.1=20hochgez=C3=A4hlt=20u?=
=?UTF-8?q?nd=20BROKEN=20als=20default=20rausgenommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
make-release.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/make-release.sh b/make-release.sh
index b5260ac..7a580d1 100644
--- a/make-release.sh
+++ b/make-release.sh
@@ -10,21 +10,21 @@
## properly configured in this script.
# if version is unset, will use the default experimental version from site.mk
-VERSION=${3:-"2016.2~exp$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2016.2.1~exp$(date '+%y%m%d%H%M')"}
# branch must be set to either experimental, beta or stable
BRANCH=${2:-"stable"}
# must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory
SIGNING_KEY=${1:-"../ecdsa-key-secret"}
#BROKEN must be set to "" or "BROKEN=1"
-BROKEN="BROKEN=1"
+BROKEN=""
cd ..
if [ ! -d "site" ]; then
echo "This script must be called from within the site directory"
- return
+ exit
fi
-if [ "$(whoami)" == "root" ]; then
+if [ "$(whoami)" == "root" ]; then
echo "Make may not be run as root"
return
fi
--
GitLab