From b200e232a04fd7baa9ed1b1ec4b4a397226d3b06 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Wed, 6 Apr 2016 12:54:39 +0200 Subject: [PATCH] posaune --- build/kivitendo-mebil.co | 5 +++++ build/kivitendo.co | 12 ++++++++++-- build/kivitendo.cp | 7 ------- build/start-build | 8 +++++++- 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100755 build/kivitendo-mebil.co delete mode 100755 build/kivitendo.cp 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 + +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 '" +echo "Available are:" +ls *.co -- 2.20.1