From cc3664bed6bccbb2d7e7e4aa117fa6de654de0c7 Mon Sep 17 00:00:00 2001 From: Soispha Date: Tue, 2 May 2023 19:11:30 +0200 Subject: Fix(hm/pkgs): Rename update to update-sys to avoid naming conflict --- .../packages/scripts/small_functions/update | 62 ---------------------- .../packages/scripts/small_functions/update-sys | 62 ++++++++++++++++++++++ 2 files changed, 62 insertions(+), 62 deletions(-) delete mode 100755 home-manager/packages/scripts/small_functions/update create mode 100755 home-manager/packages/scripts/small_functions/update-sys (limited to 'home-manager/packages/scripts/small_functions') diff --git a/home-manager/packages/scripts/small_functions/update b/home-manager/packages/scripts/small_functions/update deleted file mode 100755 index cbe994c6..00000000 --- a/home-manager/packages/scripts/small_functions/update +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env dash -# shellcheck disable=SC2086 -# shellcheck source=/dev/null -. %SHELL_LIBRARY_PATH - -help() { - cat << EOF -This is a Nixos flake update manager. - -Usage: - $name [--branch ] [--help] - -Options: - --branch | -b [branchname] select a branch to update from. - --help | -h output this help. -EOF - exit "$1"; -} -name="update"; -tmp=$(mktmp); -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"; -msg "Starting system update..."; -git remote update origin --prune > /dev/null 2>&1; -if ! [ "$BRANCH" = "" ];then - git switch "$BRANCH" > /dev/null 2>&1 && msg2 "Switched to branch '$BRANCH'"; -fi -msg2 "Updating git repository..."; -git pull --rebase; - -git remote show origin | grep 'HEAD' | cut -d':' -f2 | sed -e 's/^ *//g' -e 's/ *$//g' > $tmp & - -msg2 "Updating system..."; -nixos-rebuild switch; - -git switch "$(cat $tmp)" > /dev/null 2>&1 && msg2 "Switched to branch '$(cat $tmp)'"; -msg "Finished Update!"; - -# vim: ft=sh diff --git a/home-manager/packages/scripts/small_functions/update-sys b/home-manager/packages/scripts/small_functions/update-sys new file mode 100755 index 00000000..cbe994c6 --- /dev/null +++ b/home-manager/packages/scripts/small_functions/update-sys @@ -0,0 +1,62 @@ +#!/usr/bin/env dash +# shellcheck disable=SC2086 +# shellcheck source=/dev/null +. %SHELL_LIBRARY_PATH + +help() { + cat << EOF +This is a Nixos flake update manager. + +Usage: + $name [--branch ] [--help] + +Options: + --branch | -b [branchname] select a branch to update from. + --help | -h output this help. +EOF + exit "$1"; +} +name="update"; +tmp=$(mktmp); +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"; +msg "Starting system update..."; +git remote update origin --prune > /dev/null 2>&1; +if ! [ "$BRANCH" = "" ];then + git switch "$BRANCH" > /dev/null 2>&1 && msg2 "Switched to branch '$BRANCH'"; +fi +msg2 "Updating git repository..."; +git pull --rebase; + +git remote show origin | grep 'HEAD' | cut -d':' -f2 | sed -e 's/^ *//g' -e 's/ *$//g' > $tmp & + +msg2 "Updating system..."; +nixos-rebuild switch; + +git switch "$(cat $tmp)" > /dev/null 2>&1 && msg2 "Switched to branch '$(cat $tmp)'"; +msg "Finished Update!"; + +# vim: ft=sh -- cgit 1.4.1