From: Michael Wagner <info@wagnertech.de>
Date: Wed, 6 Apr 2016 10:54:39 +0000 (+0200)
Subject: posaune
X-Git-Tag: t1~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b200e232a04fd7baa9ed1b1ec4b4a397226d3b06;p=kivitendo-erp.git

posaune
---

diff --git a/build/kivitendo-mebil.co b/build/kivitendo-mebil.co
new file mode 100755
index 000000000..da0def497
--- /dev/null
+++ b/build/kivitendo-mebil.co
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+./kivitendo.co $*
+
diff --git a/build/kivitendo.co b/build/kivitendo.co
index 3d40317ba..e8474d273 100755
--- a/build/kivitendo.co
+++ b/build/kivitendo.co
@@ -2,13 +2,21 @@
 set -e
 
 # parameter: $1: git tag to build
+# options: -g <alternative repository>
+
+repos="https://github.com/wagner-tech"
+if getopts "g:" opt; then
+	repos=$OPTARG
+	shift 2
+fi
 
 if [ -d kivitendo-erp ]
 then
 	pushd kivitendo-erp >/dev/null
-	git fetch
+	branch=$(git rev-parse --abbrev-ref HEAD)
+	git pull origin $branch
 else
-	git clone https://github.com/wagner-tech/kivitendo-erp
+	git clone $repos/kivitendo-erp
 	pushd kivitendo-erp >/dev/null
 fi
 	git checkout $1
diff --git a/build/kivitendo.cp b/build/kivitendo.cp
deleted file mode 100755
index f0935cf8d..000000000
--- a/build/kivitendo.cp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-
-# parameter: $1: base dir for copy (optional)
-
-mkdir -p $1/opt
-cp -a src/kivitendo-erp $1/opt
diff --git a/build/start-build b/build/start-build
index a26548cf7..23256ace8 100755
--- a/build/start-build
+++ b/build/start-build
@@ -2,10 +2,16 @@
 set -e
 
 # checkout build utilities
-if [ ! -d projects ]; then
+if [ -d projects ]; then
+	pushd projects >/dev/null
+		git pull origin master
+	popd >/dev/null
+else
 	git clone https://github.com/wagner-tech/projects/
 fi
 
 ln -sf projects/tools/make/configure .
 
 echo "Next step: call 'configure <project> <tag>'"
+echo "Available are:"
+ls *.co