From 04c2620f4f80ff5fc1190ba476be1ffa28579dc3 Mon Sep 17 00:00:00 2001
From: salixor <salixor@pm.me>
Date: Tue, 16 Jan 2024 15:45:48 +0100
Subject: [PATCH] Use --autostash when rebasing + minor changes to update
messages
---
stpkg | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/stpkg b/stpkg
index 406f255..3fdbb12 100755
--- a/stpkg
+++ b/stpkg
@@ -452,18 +452,18 @@ EOF
__update() {
info "Updating packs..."
- info "... update the sticker repo"
+ info "... updating the sticker repo"
local LOCATION_OPT="--git-dir=$STPKG_BASE/.git --work-tree=$STPKG_BASE/"
- git $LOCATION_OPT fetch >/dev/null 2>&1 || die "Failed to fetch from sticker repo"
- git $LOCATION_OPT rebase >/dev/null 2>&1 || die "Failed to rebase... what did you do to your master branch?"
+ git $LOCATION_OPT fetch >/dev/null 2>&1 || die "Failed to fetch from sticker repo"
+ git $LOCATION_OPT rebase --autostash >/dev/null 2>&1 || die "Failed to rebase... what did you do to your master branch?"
- info "... update the sticker picker repo"
+ info "... updating the stickerpicker repo"
local LOCATION_OPT="--git-dir=$STPKG_INSTALL/.git --work-tree=$STPKG_INSTALL/"
- git $LOCATION_OPT fetch >/dev/null 2>&1 || die "Failed to fetch from stickerpicker repo"
- git $LOCATION_OPT rebase >/dev/null 2>&1 || die "Failed to rebase... what did you do to the master branch of the sticker picker?"
+ git $LOCATION_OPT fetch >/dev/null 2>&1 || die "Failed to fetch from stickerpicker repo"
+ git $LOCATION_OPT rebase --autostash >/dev/null 2>&1 || die "Failed to rebase... what did you do to the master branch of the sticker picker?"
- info "... copy the Json pack files in the sticker picker folder"
- cp $STPKG_BASE/packs/*/*.json $STPKG_INSTALL/web/packs/ || die "Failed to copy packs Json files"
+ info "... copying the JSON packs files in the sticker picker folder"
+ cp $STPKG_BASE/packs/*/*.json $STPKG_INSTALL/web/packs/ || die "Failed to copy JSON packs files"
local NEW_MD5=`md5sum $(readlink -f "$STPKG_BASE/stpkg")`
if [ ! "$NEW_MD5" = "$MD5" ]; then
--
GitLab