diff --git a/Makefile b/Makefile index 13c9e36..0b171ef 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ BUNDLEIN := .bundles/domu.bundle clean-workdir = git init -q -b $* && git diff --quiet && git diff --cached --quiet || (echo 'dirty tree; check git status' && false) create-bundle = git show-ref --verify --quiet refs/remotes/$(1)/$* \ - || git bundle create $(BUNDLEOUT) $* + || git bundle create $(BUNDLEOUT) $(1)/$* .PHONY: pull pull/% pull: pull/$(shell git branch --show-current) diff --git a/setup.sh b/setup.sh index 588bf8b..fd906df 100755 --- a/setup.sh +++ b/setup.sh @@ -3,9 +3,7 @@ set -eo pipefail # running in guest -echo "hmmm" guest_name="$(qubesdb-read /name)" -echo "hmmmmmm" echo $(realpath ""$0"") guest_repo_dir="$(dirname $(realpath ""$0""))" echo $guest_repo_dir @@ -44,7 +42,6 @@ git clone /tmp/saltstuff.bundle -b "${branch}" "\$1" pushd "\$1" echo "{dom0} setting up remote '${guest_name}' to push/pull changes via bundle" >&2 -echo "ehhh" mkdir ./.bundles mv /tmp/saltstuff.bundle ./.bundles/domu.bundle