mustard/qubes-salt-stuff
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: typo, () instead of {}

Browse source
This commit is contained in:
mustard 2025-10-20 15:19:48 +02:00
parent 95064bdc63
commit 1e41e58ae9
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -23,7 +23,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) 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}/$* \ create-bundle = git show-ref --verify --quiet refs/remotes/$(1)/$* \
&& git bundle create $(BUNDLEOUT) $(1)/$*..$* \ && git bundle create $(BUNDLEOUT) $(1)/$*..$* \
|| git bundle create $(BUNDLEOUT) $* || git bundle create $(BUNDLEOUT) $*

7
setup.sh
View file

@ -44,11 +44,12 @@ git clone /tmp/saltstuff.bundle -b "${branch}" "\$1"
pushd "\$1" pushd "\$1"
echo "{dom0} setting up remote '${guest_name}' to push/pull changes via bundle" >&2 echo "{dom0} setting up remote '${guest_name}' to push/pull changes via bundle" >&2
echo "ehhh"
mkdir .bundles mkdir ./.bundles
mv /tmp/saltstuff.bundle .bundles/domu.bundle mv /tmp/saltstuff.bundle ./.bundles/domu.bundle
git remote remove origin git remote remove origin
git remote add "${guest_name}" \${pwd}/.bundles/domu.bundle git remote add "${guest_name}" \$(pwd)/.bundles/domu.bundle
# ensure remote refs are present in each repo # ensure remote refs are present in each repo
git fetch "${guest_name}" # ensure remote refs are present in the dom0 repo git fetch "${guest_name}" # ensure remote refs are present in the dom0 repo