posaune

diff --git a/build/kivitendo-mebil.co b/build/kivitendo-mebil.co
new file mode 100755 (executable)
index 0000000..da0def4
--- /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 3d40317badcb5c712a36866a8fdff1088252768d..e8474d273001d6d11706e6eb9dc9e8dd7b4c47d6 100755 (executable)
--- a/build/kivitendo.co
+++ b/build/kivitendo.co
@@ -2,13 +2,21 @@
 set -e
 
 # parameter: $1: git tag to build
 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
 
 if [ -d kivitendo-erp ]
 then
        pushd kivitendo-erp >/dev/null

-       git fetch
+       branch=$(git rev-parse --abbrev-ref HEAD)
+       git pull origin $branch

 else
 else

-       git clone https://github.com/wagner-tech/kivitendo-erp
+       git clone $repos/kivitendo-erp

        pushd kivitendo-erp >/dev/null
 fi
        git checkout $1
        pushd kivitendo-erp >/dev/null
 fi
        git checkout $1

diff --git a/build/kivitendo.cp b/build/kivitendo.cp
deleted file mode 100755 (executable)
index f0935cf..0000000
--- 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 a26548cf7563dd22ae3f42fb148c91147e9fd7d4..23256ace8bad7d271e73b3f5f094d9cdcd535021 100755 (executable)
--- a/build/start-build
+++ b/build/start-build
@@ -2,10 +2,16 @@
 set -e
 
 # checkout build utilities
 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>'"
        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