Merge branch 'release/v1.0' into prod

aliases/available/ancho.aliases.bash

@@ -0,0 +1,4 @@
+cite 'about-alias'
+about-alias 'private alias collection'
+
+alias prettyjson='python -mjson.tool'

aliases/available/srg.aliases.bash

@@ -0,0 +1,25 @@
+cite 'about-alias'
+about-alias 'srg alias collection'
+
+alias prettyjson='python -mjson.tool'
+
+alias mobileHotelinfoList.dev='export MOBILE_HOTELINFO_API_URL="http://ra-dev.lan.servicereisen.de";mobileHotelinfoList'
+alias mobileHotelinfoList.stag='export MOBILE_HOTELINFO_API_URL="http://ra-staging.lan.servicereisen.de";mobileHotelinfoList'
+
+alias mobileHotelinfoGet.dev='export MOBILE_HOTELINFO_API_URL="http://ra-dev.lan.servicereisen.de";mobileHotelinfoGet'
+alias mobileHotelinfoGet.stag='export MOBILE_HOTELINFO_API_URL="http://ra-staging.lan.servicereisen.de";mobileHotelinfoGet'
+
+
+function mobileHotelinfoList(){
+    curl -i $MOBILE_HOTELINFO_API_URL/MobileHotelInfoInterface/api/hotelrating/list/RGFzSXN0RWluVGVzdFRva2Vu
+}
+
+function mobileHotelinfoGet(){
+
+    if [ -n "$1" ]; then
+
+        curl -i $MOBILE_HOTELINFO_API_URL/MobileHotelInfoInterface/api/hotelrating/RGFzSXN0RWluVGVzdFRva2Vu/$1
+    else
+        echo "Benötige eine ID. Siehe mobileHotelinfoList."
+    fi
+}

themes/base.theme.bash

@@ -94,6 +94,11 @@ function scm_prompt_info {
 
 function git_status_summary {
   awk '
+  BEGIN {
+    untracked = 0
+    unstaged = 0
+    staged = 0
+  }
   {
     if (!after_first && $0 ~ /^##.+/) {
       print $0
@@ -202,7 +207,6 @@ function git_prompt_vars {
 
   SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
   SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
-  SCM_CHANGE=$(git rev-parse HEAD 2>/dev/null)
 
   #RESET LANG
   LANG=$LANG_BAK