diff options
| author | Karel Kočí <cynerd@email.cz> | 2018-08-26 16:53:31 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2018-08-26 16:53:31 +0200 |
| commit | e1248d3187dbdf05927cb1716e13f2493700d66e (patch) | |
| tree | cff4c5bfa19abe2ca810052146ba3f38e89a64ae | |
| parent | 78483e0fdd6ccfbc4de04028d40d97a2f32bee49 (diff) | |
| download | laminar-cnf-e1248d3187dbdf05927cb1716e13f2493700d66e.tar.gz laminar-cnf-e1248d3187dbdf05927cb1716e13f2493700d66e.tar.bz2 laminar-cnf-e1248d3187dbdf05927cb1716e13f2493700d66e.zip | |
Even more fixes
| -rw-r--r-- | scripts/utils | 5 | ||||
| -rwxr-xr-x | templates/turris3x.run | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/utils b/scripts/utils index 65ee41a..388d399 100644 --- a/scripts/utils +++ b/scripts/utils @@ -13,11 +13,10 @@ echo_stage() { git_fetch() { local BRANCH="$3" [ -n "$BRANCH" ] || BRANCH=master - local GITARGS="--git-dir=\"$WORKSPACE/$2\" --bare" if [ -d "$WORKSPACE/$2" ]; then - git $GITARGS fetch --prune --prune-tags --force "$1" "$BRANCH:$BRANCH" + git --git-dir="$WORKSPACE/$2" --bare fetch --prune --prune-tags --force "$1" "$BRANCH:$BRANCH" else git clone --bare "$1" "$WORKSPACE/$2" fi - git $GITARGS worktree add --detach $2 $BRANCH + git --git-dir="$WORKSPACE/$2" --bare worktree add --detach $2 $BRANCH } diff --git a/templates/turris3x.run b/templates/turris3x.run index 0bcf7b4..08f200d 100755 --- a/templates/turris3x.run +++ b/templates/turris3x.run @@ -6,7 +6,7 @@ echo_stage "Get packages" git_fetch "$GIT_REPO" pkgs turris3x # TODO download only once a day -echo_strage "Download SDK" +echo_stage "Download SDK" curl "$SDK_URI" > sdk.tar.bz2 mv sdk.tar.bz2 "$WORKSPACE/sdk.tar.bz2" |