Skip to content

Commit

Permalink
Updated updater:
Browse files Browse the repository at this point in the history
- Fixed 'No tracking information for the current branch'
  • Loading branch information
Nubuki-all committed Apr 7, 2024
1 parent 61525a5 commit 49d7761
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions update.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ def varssaver(evars, files):
rvars = varsgetter(r_filep)
update_check = Path("update")
cmd = (
"git reset --hard @{u} \
&& git clean -df -q \
&& git fetch --all "
f"&& git switch {UPSTREAM_BRANCH} \
&& git pull"
f"git switch {UPSTREAM_BRANCH} -q \
&& git pull -q "
"&& git reset --hard @{u} -q \
&& git clean -df -q"
)
cmd2 = f"git init -q \
&& git config --global user.email 117080364+Niffy-the-conqueror@users.noreply.github.com \
Expand All @@ -55,7 +54,8 @@ def varssaver(evars, files):
&& git commit -sm update -q \
&& git remote add origin {UPSTREAM_REPO} \
&& git fetch origin -q \
&& git reset --hard origin/{UPSTREAM_BRANCH} -q"
&& git reset --hard origin/{UPSTREAM_BRANCH} -q \
&& git switch {UPSTREAM_BRANCH} -q"

try:
if ALWAYS_DEPLOY_LATEST is True or update_check.is_file():
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.2.0-beta.0.6.23 (beta)
v2.2.0-beta.0.6.24 (beta)

0 comments on commit 49d7761

Please sign in to comment.