From d64c753bc22f53741b63cc1369c27887353a0408 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Thu, 6 Jul 2017 19:08:56 +0200
Subject: [PATCH] Fixed static_get bundle

---
 .../bundles/static_get/01_get.sh              | 11 ++++------
 .../bundles/static_get/02_install.sh          | 21 ++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/minimal_overlay/bundles/static_get/01_get.sh b/src/minimal_overlay/bundles/static_get/01_get.sh
index 4bad67ea3..ad1425db8 100755
--- a/src/minimal_overlay/bundles/static_get/01_get.sh
+++ b/src/minimal_overlay/bundles/static_get/01_get.sh
@@ -2,10 +2,7 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 # Grab everything after the '=' character.
 DOWNLOAD_URL=$(grep -i STATIC_GET_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
@@ -30,11 +27,11 @@ fi
 
 # Delete folder with previously prepared static-get.
 echo "Removing static-get work area. This may take a while..."
-rm -rf ../../work/overlay/staget
-mkdir ../../work/overlay/staget
+rm -rf $WORK_DIR/overlay/staget
+mkdir $WORK_DIR/overlay/staget
 
 # Copy static-get to folder 'work/overlay/staget'.
-cp static-get.sh ../../work/overlay/staget
+cp static-get.sh $WORK_DIR/overlay/staget
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/static_get/02_install.sh b/src/minimal_overlay/bundles/static_get/02_install.sh
index 611a73ec5..59316a1f4 100755
--- a/src/minimal_overlay/bundles/static_get/02_install.sh
+++ b/src/minimal_overlay/bundles/static_get/02_install.sh
@@ -2,31 +2,28 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 echo "Removing old static-get artifacts. This may take a while..."
-rm -rf $MAIN_SRC_DIR/work/overlay/staget/staget_installed
-mkdir -p $MAIN_SRC_DIR/work/overlay/staget/staget_installed/opt/staget
-mkdir -p $MAIN_SRC_DIR/work/overlay/staget/staget_installed/bin
+rm -rf $WORK_DIR/overlay/staget/staget_installed
+mkdir -p $WORK_DIR/overlay/staget/staget_installed/opt/staget
+mkdir -p $WORK_DIR/overlay/staget/staget_installed/bin
 
-cd $MAIN_SRC_DIR/work/overlay/staget
+cd $WORK_DIR/overlay/staget
 
 cp $MAIN_SRC_DIR/source/overlay/static-get.sh .
 
 chmod +rx static-get.sh
 
-cp static-get.sh $MAIN_SRC_DIR/work/overlay/staget/staget_installed/opt/staget
+cp static-get.sh $WORK_DIR/overlay/staget/staget_installed/opt/staget
 
-cd $MAIN_SRC_DIR/work/overlay/staget/staget_installed
+cd $WORK_DIR/overlay/staget/staget_installed
 
 ln -s ../opt/staget/static-get.sh bin/static-get
 ln -s ../opt/staget/static-get.sh bin/mll-get
 
-cp -r $MAIN_SRC_DIR/work/overlay/staget/staget_installed/* \
-  $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
+cp -r $WORK_DIR/overlay/staget/staget_installed/* \
+  $WORK_DIR/src/minimal_overlay/rootfs
 
 echo "static-get has been installed."