version bump script; minor bugfixes

bump-version.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+this="$(readlink -f "${0}")"
+this_dir="$(dirname "${this}")"
+
+git_branch="$(git rev-parse --abbrev-ref HEAD)"
+version_str="${git_branch##*/}"
+
+echo "${version_str}" > "${this_dir}/src/etc/version_tag"
+sed -ri "s/(version\s*:).*$/\1 '${version_str}'/" "${this_dir}/example/kiwi.yml"

example/kiwi.yml

@@ -2,7 +2,7 @@
 # kiwi-scp instance configuration #
 ###################################
 
-version: '0.1.2'
+version: '0.1.3'
 
 runtime:
   storage: /tmp/kiwi

kiwi

@@ -12,7 +12,7 @@ KIWI_VERSION_TAG="etc/version_tag"
 # dependencies to run kiwi-scp
 KIWI_DEPENDENCIES="python3 pipenv less docker docker-compose"
 # base install dir
-KIWI_BASEDIR="${HOME}/.local/lib/kiwi-scp"
+KIWI_BASEDIR="${HOME}/.cache/kiwi-scp"
 # per-user env setup script
 KIWI_PROFILE="${HOME}/.kiwi_profile"
 
@@ -122,7 +122,7 @@ fi
 # run check for new kiwi version
 if [ "${run_kiwi_check}" = "yes" ]; then
   # hash this script and the master version
-  hash_local="$(md5sum <"$(readlink "${0}")")"
+  hash_local="$(md5sum <"$(readlink -f "${0}")")"
   hash_remote="$(curl --proto '=https' --tlsv1.2 -sSfL "${KIWI_URI}" | md5sum)"
 
   # warn if different

src/etc/version_tag

@@ -1 +1 @@
-0.1.2
+0.1.3