From d59d2b8c8e487d97b44ecf8219433df06b336991 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Sat, 15 Apr 2023 14:39:17 +0200
Subject: Fix(hm/pkgs/scr/update): Reset branch after update

---
 .../packages/scripts/small_functions/update        | 41 ---------------------
 .../packages/scripts/small_functions/update.sh     | 43 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 41 deletions(-)
 delete mode 100755 home-manager/packages/scripts/small_functions/update
 create mode 100755 home-manager/packages/scripts/small_functions/update.sh

(limited to 'home-manager/packages/scripts')

diff --git a/home-manager/packages/scripts/small_functions/update b/home-manager/packages/scripts/small_functions/update
deleted file mode 100755
index 7b7b2e01..00000000
--- a/home-manager/packages/scripts/small_functions/update
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
-
-help() {
-    cat << EOF
-    --branch | -b  [branchname]     select a branch to update from.
-    --help   | -h                   output this help.
-EOF
-    exit "$1";
-}
-
-BRANCH="";
-
-while [ "$#" -gt 0 ];do
-    case "$1" in
-        "--help" | "-h")
-            help 0;
-            ;;
-        "--branch" | "-b")
-            if [ -n "$2" ];then
-                BRANCH="$2";
-            else
-                error "$1 requires an argument";
-                help 1;
-            fi
-            shift 2;
-            ;;
-        *)
-            error "the option $1 does not exist!";
-            help 1;
-            ;;
-    esac
-done
-
-
-cd /etc/nixos || die "No /etc/nixos"
-[ "$BRANCH" = "" ] || git switch "$BRANCH";
-git pull --rebase
-nixos-rebuild switch
diff --git a/home-manager/packages/scripts/small_functions/update.sh b/home-manager/packages/scripts/small_functions/update.sh
new file mode 100755
index 00000000..a8a838e8
--- /dev/null
+++ b/home-manager/packages/scripts/small_functions/update.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env dash
+# shellcheck disable=SC2086
+# shellcheck source=/dev/null
+. %SHELL_LIBRARY_PATH
+
+help() {
+    cat << EOF
+    --branch | -b  [branchname]     select a branch to update from.
+    --help   | -h                   output this help.
+EOF
+    exit "$1";
+}
+tmp=$(mktmp);
+git remote show origin | grep 'HEAD' | cut -d':' -f2 | sed -e 's/^ *//g' -e 's/ *$//g' > $tmp &
+BRANCH="";
+
+while [ "$#" -gt 0 ];do
+    case "$1" in
+        "--help" | "-h")
+            help 0;
+            ;;
+        "--branch" | "-b")
+            if [ -n "$2" ];then
+                BRANCH="$2";
+            else
+                error "$1 requires an argument";
+                help 1;
+            fi
+            shift 2;
+            ;;
+        *)
+            error "the option $1 does not exist!";
+            help 1;
+            ;;
+    esac
+done
+
+
+cd /etc/nixos || die "No /etc/nixos"
+git pull --rebase
+[ "$BRANCH" = "" ] || git switch "$BRANCH";
+nixos-rebuild switch
+git switch "$(cat $tmp)";
-- 
cgit 1.4.1