From d96e29faa6ffa38c9576640cad1ca0f0ef645110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 29 Aug 2018 19:26:09 +0200
Subject: turris4x: fix compile_fw failure

Tilda is not expanded in compile_fw. This just uses HOME instead of
tilda.
---
 scripts/utils          | 6 +++---
 templates/turris4x.run | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/utils b/scripts/utils
index a689c12..2d549e6 100644
--- a/scripts/utils
+++ b/scripts/utils
@@ -11,8 +11,8 @@ templateid() {
 	basename "$(readlink -f "$0")" | sed 's/\.run$//'
 }
 
-TWORKSPACE="~/workspace/$(templateid)"
-[ "$(jobid)" != "$(templateid)" ] || TWORKSPACE="~/workspace/notemplate"
+TWORKSPACE="$HOME/workspace/$(templateid)"
+[ "$(jobid)" != "$(templateid)" ] || TWORKSPACE="$HOME/Workspace/notemplate"
 
 ## Simple echo wrappers #########################################################
 echo_stage() {
@@ -82,7 +82,7 @@ git_fetch_t() {
 	_git_fetch "$1" "$2" "$3" "$TWORKSPACE/git-mirror"
 }
 git_fetch_g() {
-	_git_fetch "$1" "$2" "$3" "~/workspace/git-mirror"
+	_git_fetch "$1" "$2" "$3" "$HOME/workspace/git-mirror"
 }
 
 # Clones one depth given repository with given branch/tag/hash
diff --git a/templates/turris4x.run b/templates/turris4x.run
index a916dc5..9321d90 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -22,7 +22,6 @@ else
 	echo_stage "Prepare SDK"
 	mkdir openwrt
 	cd openwrt
-	echo "Template workspace: $TWORKSPACE/openwrt-git-mirror"
 	GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror" \
 		CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" \
 		CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" \
-- 
cgit v1.2.3