diff options
| author | Karel Kočí <cynerd@email.cz> | 2018-08-29 19:26:09 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2018-08-29 19:31:09 +0200 |
| commit | d96e29faa6ffa38c9576640cad1ca0f0ef645110 (patch) | |
| tree | 7366f24448951752d70ff6687a10b567faf8531a | |
| parent | 50e5df74f06836aed205cfc9428a4428b334df6d (diff) | |
| download | laminar-cnf-d96e29faa6ffa38c9576640cad1ca0f0ef645110.tar.gz laminar-cnf-d96e29faa6ffa38c9576640cad1ca0f0ef645110.tar.bz2 laminar-cnf-d96e29faa6ffa38c9576640cad1ca0f0ef645110.zip | |
turris4x: fix compile_fw failure
Tilda is not expanded in compile_fw. This just uses HOME instead of
tilda.
| -rw-r--r-- | scripts/utils | 6 | ||||
| -rwxr-xr-x | 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" \ |