From 59710a812e0587f425ef9b26d56bb571e4a0937d Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 22 Sep 2014 09:30:42 +0200
Subject: [PATCH] [Project] cleaned up scripts

---
 li.strolch.dev/aheadStatus.cmd                | 48 -------------------
 li.strolch.dev/aheadStatus.sh                 | 36 --------------
 li.strolch.dev/bootstrap.cmd                  | 35 --------------
 li.strolch.dev/bootstrap.sh                   | 34 -------------
 li.strolch.dev/bootstrap_https.cmd            | 35 --------------
 li.strolch.dev/bootstrap_https.sh             | 34 -------------
 li.strolch.dev/projects.lst                   |  5 --
 li.strolch.dev/projects_all.lst               | 17 -------
 li.strolch.dev/pull.cmd                       | 36 --------------
 li.strolch.dev/pull.sh                        | 42 ++++++++--------
 li.strolch.dev/push.cmd                       | 36 --------------
 li.strolch.dev/push.sh                        | 40 ++++++++--------
 release.sh => li.strolch.dev/release.sh       |  0
 setVersion.sh => li.strolch.dev/setVersion.sh |  0
 li.strolch.dev/status.cmd                     | 36 --------------
 li.strolch.dev/status.sh                      | 21 +-------
 16 files changed, 40 insertions(+), 415 deletions(-)
 delete mode 100644 li.strolch.dev/aheadStatus.cmd
 delete mode 100755 li.strolch.dev/aheadStatus.sh
 delete mode 100644 li.strolch.dev/bootstrap.cmd
 delete mode 100755 li.strolch.dev/bootstrap.sh
 delete mode 100644 li.strolch.dev/bootstrap_https.cmd
 delete mode 100755 li.strolch.dev/bootstrap_https.sh
 delete mode 100644 li.strolch.dev/projects.lst
 delete mode 100644 li.strolch.dev/projects_all.lst
 delete mode 100644 li.strolch.dev/pull.cmd
 delete mode 100644 li.strolch.dev/push.cmd
 rename release.sh => li.strolch.dev/release.sh (100%)
 rename setVersion.sh => li.strolch.dev/setVersion.sh (100%)
 delete mode 100644 li.strolch.dev/status.cmd

diff --git a/li.strolch.dev/aheadStatus.cmd b/li.strolch.dev/aheadStatus.cmd
deleted file mode 100644
index 2fa36fbfc..000000000
--- a/li.strolch.dev/aheadStatus.cmd
+++ /dev/null
@@ -1,48 +0,0 @@
-@echo off
-REM #######################################################################
-REM ##
-REM ## Shows how far ahead each project is against origin
-REM ##
-REM #######################################################################
-
-setlocal
-setlocal ENABLEDELAYEDEXPANSION
-
-echo.
-echo INFO: Showing ahead status of all projects...
-echo.
-for /F  %%i in ('type projects.lst') do (
-  set project=%%i
-
-  if not exist "..\!project!" (
-    echo INFO: Project !project! does not exist. Maybe you need to bootstrap?
-  ) else (
-    cd ..\!project!
-    set tmpFile=%RANDOM%%RANDOM%.tmp
-    git rev-list origin..master --count > !tmpFile!
-    if !ERRORLEVEL! NEQ 0 (
-      del !tmpFile!
-      goto :FAIL
-    )
-    for /F %%i in ('type !tmpFile!') do (
-      set aheadCount=%%i
-      if !aheadCount! NEQ 0 (
-        echo INFO: !aheadCount! commits not pushed for project !project!
-      ) else (
-        echo INFO: Project !project! is clean.
-      )
-    )
-    del !tmpFile!
-    if !ERRORLEVEL! NEQ 0 goto :FAIL
-  )
-)
-
-echo.
-echo INFO: Done.
-echo.
-endlocal
-exit /b 0
-
-:FAIL
-echo INFO: Failed to show ahead status a project.
-exit /b !ERRORLEVEL!
\ No newline at end of file
diff --git a/li.strolch.dev/aheadStatus.sh b/li.strolch.dev/aheadStatus.sh
deleted file mode 100755
index e16b79424..000000000
--- a/li.strolch.dev/aheadStatus.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-projectsFile="${PWD}/projects.lst"
-
-function logAheadCount() {
-  aheadCount="$(git rev-list origin..master --count)"
-#  if [ "${aheadCount}" -ne 0 ] ; then
-    project="${PWD}"
-  	project="${project##*/}"
-  	echo "== Status: ${project}..."
-    echo "${aheadCount} commits need pushing for ${project}"
-#  fi
-}
-
-cd ..
-while read project; do
-  if [ "${project}" == "" ] ; then
-  	continue;
-  fi
-
-  array=(${project//:/ })
-  name="${array[0]}"
-  tag="${array[1]}"
-
-  if [ "${name}" == "" ] ||  [ "${tag}" == "" ] ; then
-    echo -e "ERROR: Invalid project: ${project}! Must have form <git_name:tag>"
-    exit 1
-  fi
-
-  cd "${name}"
-  logAheadCount
-  cd ..
-done < ${projectsFile}
-
-echo "Done."
-exit 0
diff --git a/li.strolch.dev/bootstrap.cmd b/li.strolch.dev/bootstrap.cmd
deleted file mode 100644
index d425af482..000000000
--- a/li.strolch.dev/bootstrap.cmd
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off
-REM #######################################################################
-REM ##
-REM ## Bootstrap developing of projects by cloning all the projects.
-REM ##
-REM #######################################################################
-
-setlocal
-setlocal ENABLEDELAYEDEXPANSION
-
-echo.
-echo INFO: Cloning all projects...
-echo.
-for /F  %%i in ('type projects.lst') do (
-    set project=%%i
-
-    if exist "..\!project!" (
-      echo INFO: Project !project! already exists. Not cloning
-    ) else (
-      echo INFO: Cloning project !project! ...
-      git clone git@github.com:eitchnet/!project!.git ..\!project!
-      if !ERRORLEVEL! NEQ 0 goto :FAIL
-      echo.
-    )
-)
-
-echo.
-echo INFO: Done.
-echo.
-endlocal
-exit /b 0
-
-:FAIL
-echo INFO: Failed to clone a project.
-exit /b !ERRORLEVEL!
\ No newline at end of file
diff --git a/li.strolch.dev/bootstrap.sh b/li.strolch.dev/bootstrap.sh
deleted file mode 100755
index 2c9e24dc0..000000000
--- a/li.strolch.dev/bootstrap.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-projectsFile="${PWD}/projects.lst"
-
-echo "Cloning projects using SSH..."
-
-cd ..
-while read project; do
-  if [ "${project}" == "" ] ; then
-  	continue;
-  fi
-
-  array=(${project//:/ })
-  name="${array[0]}"
-  tag="${array[1]}"
-
-  if [ "${name}" == "" ] ||  [ "${tag}" == "" ] ; then
-    echo -e "ERROR: Invalid project: ${project}! Must have form <git_name:tag>"
-    exit 1
-  fi
-
-  echo "== Cloning ${project}..."
-  if [ -d "${name}" ] ; then
-    echo "Project ${name} already cloned."
-  else
-    if ! git clone "git@github.com:eitchnet/${name}.git" "${name}" ;then
-      exit 1
-    fi
-    echo
-  fi
-done < ${projectsFile}
-
-echo "Done."
-exit 0
diff --git a/li.strolch.dev/bootstrap_https.cmd b/li.strolch.dev/bootstrap_https.cmd
deleted file mode 100644
index aa012b1a6..000000000
--- a/li.strolch.dev/bootstrap_https.cmd
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off
-REM #######################################################################
-REM ##
-REM ## Bootstrap developing of projects by cloning all the projects.
-REM ##
-REM #######################################################################
-
-setlocal
-setlocal ENABLEDELAYEDEXPANSION
-
-echo.
-echo INFO: Cloning all projects...
-echo.
-for /F  %%i in ('type projects.lst') do (
-    set project=%%i
-
-    if exist "..\!project!" (
-      echo INFO: Project !project! already exists. Not cloning
-    ) else (
-      echo INFO: Cloning project !project! ...
-      git git clone https://github.com/eitchnet/!project!.git ..\!project!
-      if !ERRORLEVEL! NEQ 0 goto :FAIL
-      echo.
-    )
-)
-
-echo.
-echo INFO: Done.
-echo.
-endlocal
-exit /b 0
-
-:FAIL
-echo INFO: Failed to clone a project.
-exit /b !ERRORLEVEL!
\ No newline at end of file
diff --git a/li.strolch.dev/bootstrap_https.sh b/li.strolch.dev/bootstrap_https.sh
deleted file mode 100755
index 4bcc711dc..000000000
--- a/li.strolch.dev/bootstrap_https.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-projectsFile="${PWD}/projects.lst"
-
-echo "Cloning projects using HTTPS..."
-
-cd ..
-while read project; do
-  if [ "${project}" == "" ] ; then
-  	continue;
-  fi
-
-  array=(${project//:/ })
-  name="${array[0]}"
-  tag="${array[1]}"
-
-  if [ "${name}" == "" ] ||  [ "${tag}" == "" ] ; then
-    echo -e "ERROR: Invalid project: ${project}! Must have form <git_name:tag>"
-    exit 1
-  fi
-
-  echo "== Cloning ${project}..."
-  if [ -d "${name}" ] ; then
-    echo "Project ${name} already cloned."
-  else
-    if ! git clone "https://github.com/eitchnet/${name}.git" "${name}" ;then
-      exit 1
-    fi
-    echo
-  fi
-done < ${projectsFile}
-
-echo "Done."
-exit 0
diff --git a/li.strolch.dev/projects.lst b/li.strolch.dev/projects.lst
deleted file mode 100644
index 1a482d14d..000000000
--- a/li.strolch.dev/projects.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-ch.eitchnet:master
-ch.eitchnet.parent:master
-ch.eitchnet.privilege:master
-ch.eitchnet.utils:master
-ch.eitchnet.xmlpers:master
diff --git a/li.strolch.dev/projects_all.lst b/li.strolch.dev/projects_all.lst
deleted file mode 100644
index a66db9e5e..000000000
--- a/li.strolch.dev/projects_all.lst
+++ /dev/null
@@ -1,17 +0,0 @@
-ch.eitchnet.parent:1.0.0
-ch.eitchnet.privilege:master
-ch.eitchnet.utils:master
-ch.eitchnet.xmlpers:master
-li.strolch.dev:master
-li.strolch.parent:master
-li.strolch.bom:master
-li.strolch.model:master
-li.strolch.testbase:master
-li.strolch.agent:master
-li.strolch.service:master
-li.strolch.rest:master
-li.strolch.persistence.xml:master
-li.strolch.persistence.postgresql:master
-li.strolch.tutorialapp:master
-li.strolch.tutorialwebapp:master
-li.strolch.website:master
diff --git a/li.strolch.dev/pull.cmd b/li.strolch.dev/pull.cmd
deleted file mode 100644
index 802a99458..000000000
--- a/li.strolch.dev/pull.cmd
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-REM #######################################################################
-REM ##
-REM ## Script to pull all projects from upstream
-REM ##
-REM #######################################################################
-
-setlocal
-setlocal ENABLEDELAYEDEXPANSION
-
-echo.
-echo INFO: Pulling all projects...
-echo.
-for /F  %%i in ('type projects.lst') do (
-  set project=%%i
-
-  if exist "..\!project!" (
-      echo INFO: Pullin project !project! ...
-      cd ..\!project!
-      git status pull
-      if !ERRORLEVEL! NEQ 0 goto :FAIL
-      echo.
-    ) else (
-      echo INFO: Project !project! does not exist. Maybe you need to bootstrap?
-    )
-)
-
-echo.
-echo INFO: Done.
-echo.
-endlocal
-exit /b 0
-
-:FAIL
-echo INFO: Failed to pull a project.
-exit /b !ERRORLEVEL!
diff --git a/li.strolch.dev/pull.sh b/li.strolch.dev/pull.sh
index 97312ce60..f829709fa 100755
--- a/li.strolch.dev/pull.sh
+++ b/li.strolch.dev/pull.sh
@@ -1,30 +1,26 @@
 #!/bin/bash
 
-projectsFile="${PWD}/projects.lst"
+function fail() {
+  echo -e "\nERROR: Failed to pull from upstream"
+  exit 1
+}
+
+current_branch="$(git branch --quiet | grep "*" | cut -d ' ' -f 2)"
+if [ "${current_branch}" == "" ] ; then
+  echo -e "\nERROR: No local branch found!"
+  fail
+fi
 
 cd ..
-while read project; do
-  if [ "${project}" == "" ] ; then
-  	continue;
-  fi
 
-  array=(${project//:/ })
-  name="${array[0]}"
-  tag="${array[1]}"
+echo "INFO: Pulling Strolch..."
+if ! git pull origin "${current_branch}:${current_branch}" ; then
+  fail
+fi
+echo "INFO: Pulling submodules..."
+if ! git submodule foreach git pull origin "${current_branch}:${current_branch}" ; then
+  fail
+fi
 
-  if [ "${name}" == "" ] ||  [ "${tag}" == "" ] ; then
-    echo -e "ERROR: Invalid project: ${project}! Must have form <git_name:tag>"
-    exit 1
-  fi
-
-  echo "== Pulling ${project}..."
-  cd ${name}
-  git pull origin ${tag}
-  git checkout ${tag}
-  cd ..
-  echo
-
-done < ${projectsFile}
-
-echo "Done."
+echo -e "\nINFO: Pulled all Strolch projects."
 exit 0
diff --git a/li.strolch.dev/push.cmd b/li.strolch.dev/push.cmd
deleted file mode 100644
index 188a91dca..000000000
--- a/li.strolch.dev/push.cmd
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-REM #######################################################################
-REM ##
-REM ## Distribute all projects by pushing to upstream
-REM ##
-REM #######################################################################
-
-setlocal
-setlocal ENABLEDELAYEDEXPANSION
-
-echo.
-echo INFO: Pushing all projects...
-echo.
-for /F  %%i in ('type projects.lst') do (
-  set project=%%i
-
-  if exist "..\!project!" (
-      echo INFO: Pushing project !project! ...
-      cd ..\!project!
-      git push
-      if !ERRORLEVEL! NEQ 0 goto :FAIL
-      echo.
-    ) else (
-      echo INFO: Project !project! does not exist. Maybe you need to bootstrap?
-    )
-)
-
-echo.
-echo INFO: Done.
-echo.
-endlocal
-exit /b 0
-
-:FAIL
-echo INFO: Failed to push a project.
-exit /b !ERRORLEVEL!
diff --git a/li.strolch.dev/push.sh b/li.strolch.dev/push.sh
index af735bebd..9b887636f 100755
--- a/li.strolch.dev/push.sh
+++ b/li.strolch.dev/push.sh
@@ -1,28 +1,26 @@
 #!/bin/bash
 
-projectsFile="${PWD}/projects.lst"
+function fail() {
+  echo -e "\nERROR: Failed to push to upstream"
+  exit 1
+}
+
+current_branch="$(git branch --quiet | grep "*" | cut -d ' ' -f 2)"
+if [ "${current_branch}" == "" ] ; then
+  echo -e "\nERROR: No local branch found!"
+  fail
+fi
 
 cd ..
-while read project; do
-  if [ "${project}" == "" ] ; then
-  	continue;
-  fi
 
-  array=(${project//:/ })
-  name="${array[0]}"
-  tag="${array[1]}"
+echo "INFO: Pushing Strolch..."
+if ! git push origin "${current_branch}:${current_branch}" ; then
+  fail
+fi
+echo "INFO: Pushing submodules..."
+if ! git submodule foreach git push origin "${current_branch}:${current_branch}" ; then
+  fail
+fi
 
-  if [ "${name}" == "" ] ||  [ "${tag}" == "" ] ; then
-    echo -e "ERROR: Invalid project: ${project}! Must have form <git_name:tag>"
-    exit 1
-  fi
-
-  echo "== Pushing ${name}..."
-  cd ${name}
-  git push
-  cd ..
-  echo
-done < ${projectsFile}
-
-echo "Done."
+echo -e "\nINFO: Pushed all Strolch projects."
 exit 0
diff --git a/release.sh b/li.strolch.dev/release.sh
similarity index 100%
rename from release.sh
rename to li.strolch.dev/release.sh
diff --git a/setVersion.sh b/li.strolch.dev/setVersion.sh
similarity index 100%
rename from setVersion.sh
rename to li.strolch.dev/setVersion.sh
diff --git a/li.strolch.dev/status.cmd b/li.strolch.dev/status.cmd
deleted file mode 100644
index c5c17d022..000000000
--- a/li.strolch.dev/status.cmd
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-REM #######################################################################
-REM ##
-REM ## Show status of all projects
-REM ##
-REM #######################################################################
-
-setlocal
-setlocal ENABLEDELAYEDEXPANSION
-
-echo.
-echo INFO: Showing status of all projects...
-echo.
-for /F  %%i in ('type projects.lst') do (
-  set project=%%i
-
-  if exist "..\!project!" (
-      echo INFO: Status of project !project!:
-      cd ..\!project!
-      git status -s
-      if !ERRORLEVEL! NEQ 0 goto :FAIL
-      echo.
-    ) else (
-      echo INFO: Project !project! does not exist. Maybe you need to bootstrap?
-    )
-)
-
-echo.
-echo INFO: Done.
-echo.
-endlocal
-exit /b 0
-
-:FAIL
-echo INFO: Failed to show status a project.
-exit /b !ERRORLEVEL!
diff --git a/li.strolch.dev/status.sh b/li.strolch.dev/status.sh
index 70982c56c..13573d3ad 100755
--- a/li.strolch.dev/status.sh
+++ b/li.strolch.dev/status.sh
@@ -3,26 +3,9 @@
 projectsFile="${PWD}/projects.lst"
 
 cd ..
-while read project; do
-  if [ "${project}" == "" ] ; then
-  	continue;
-  fi
 
-  array=(${project//:/ })
-  name="${array[0]}"
-  tag="${array[1]}"
-
-  if [ "${name}" == "" ] ||  [ "${tag}" == "" ] ; then
-    echo -e "ERROR: Invalid project: ${project}! Must have form <git_name:tag>"
-    exit 1
-  fi
-
-  echo "== Status of ${name}..."
-  cd ${name}
-  git status -s
-  cd ..
-  echo
-done < ${projectsFile}
+git status
+git submodule foreach git status
 
 echo "Done."
 exit 0