mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update xo-install.sh

Browse Source 
Fixes #128
Also fixes force pushes to named branches, which cause `--ff-only` to fail

Co-authored-by: Roni Väyrynen <roni@vayrynen.info>
This commit is contained in:
Stephen Boyd
2022-06-24 15:38:09 -07:00
committed by Stephen Boyd
parent 896824d412
commit e13c52f5f1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xo-install.sh
View File

@@ -573,14 +573,16 @@ function PrepInstall {
fi
echo
# keep the actual source code in one directory and either clone or git pull depending on if directory exists already
# keep the actual source code in one directory and either clone or git fetch depending on if directory exists already
printinfo "Fetching $XO_SVC_DESC source code"
if [[ ! -d "$XO_SRC_DIR" ]]; then
runcmd "mkdir -p \"$XO_SRC_DIR\""
runcmd "git clone \"${REPOSITORY}\" \"$XO_SRC_DIR\""
else
runcmd "cd \"$XO_SRC_DIR\" && git pull --ff-only"
runcmd "cd $SCRIPT_DIR"
runcmd "cd \"$XO_SRC_DIR\" && git remote set-url origin \"${REPOSITORY}\" && \
git fetch --prune && \
git reset --hard origin/master && \
git clean -xdff"
fi
# Deploy the latest xen-orchestra source to the new install directory.