junk

release-cookbook

@@ -13,16 +13,16 @@ rm -rf dist/slapos.cookbook*
 # for now this script is hardcoded to release on 1.0.x versions intentionally
 # update to version 2 or 1.1 would require a major reorganisation on the release
 # process
-CURRENT_VERSION=`git tag | grep "^1\+\.0\+\.[0-9]\+$" | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -1`
-NEXT_MINOR_VERSION=$((`echo $CURRENT_VERSION | cut -f3 -d.`+1))
+CURRENT_VERSION=$(git tag | grep "^1\+\.0\+\.[0-9]\+$" | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -1)
+NEXT_MINOR_VERSION=$(($(echo "$CURRENT_VERSION" | cut -f3 -d.)+1))
 NEXT_VERSION=1.0.$NEXT_MINOR_VERSION
 
-CURRENT_EGG_VERSION=`cat setup.py | grep ^version | cut -d\' -f2`
+CURRENT_EGG_VERSION=$(grep setup.py  ^version | cut -d\' -f2)
 
 sed -i "s/$CURRENT_EGG_VERSION/$NEXT_VERSION/g" setup.py
 git commit -m "Release slapos.cookbook ($NEXT_VERSION)" setup.py
 
-if [ ! $EGG_ONLY == "Y" ];
+if [ ! "$EGG_ONLY" == "Y" ];
 then
   sed -i "s/slapos.cookbook = $CURRENT_EGG_VERSION/slapos.cookbook = $NEXT_VERSION/g" stack/slapos.cfg
   sed -i "s/slapos.cookbook==$CURRENT_EGG_VERSION/slapos.cookbook==$NEXT_VERSION/g" stack/slapos.cfg

software/metabase/software.cfg

@@ -13,6 +13,7 @@ extends =
 parts =
   slapos-cookbook
   instance-profile
+  xserver
 
 [python]
 part = python3

software/metabase/test/test.py

@@ -95,3 +95,5 @@ class TestMetabaseSetup(MetabaseTestCase):
             "password": password
         }).json()
     self.assertTrue(session.get('id'))
+
+    import pdb; pdb.set_trace()
\ No newline at end of file