From b22a8c6397ff48ecb43503476eab66c73ee66b9b Mon Sep 17 00:00:00 2001
From: Ducky <ducky@zio.sh>
Date: Tue, 15 Aug 2023 17:01:53 +0100
Subject: [PATCH] various

---
 .gitignore                         |  1 +
 usr/local/bin/sh.zio.update-rootfs | 19 +++++++++++++++++++
 usr/local/bin/zio-update-rootfs    | 11 -----------
 3 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100755 usr/local/bin/sh.zio.update-rootfs
 delete mode 100755 usr/local/bin/zio-update-rootfs

diff --git a/.gitignore b/.gitignore
index 8deb159..9f0f066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@
 !/usr/local/bin/sh.zio.backup
 !/usr/local/bin/sh.zio.install-package
 !/usr/local/bin/sh.zio.pod-exec
+!/usr/local/bin/sh.zio.update-rootfs
 !/usr/local/bin/zio-backup
 !/usr/local/bin/zio-libvirt-port-forward
 !/usr/local/bin/zio-update-caddy
diff --git a/usr/local/bin/sh.zio.update-rootfs b/usr/local/bin/sh.zio.update-rootfs
new file mode 100755
index 0000000..93acd83
--- /dev/null
+++ b/usr/local/bin/sh.zio.update-rootfs
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+if [[ "$(realpath "$(dirname "$(realpath -s "$0")")/../../../")" == "/" ]]; then
+    . /usr/local/libexec/zio/helpers/bash.sh
+else
+    . "$(dirname "$(realpath -s "$0")")/../libexec/zio/helpers/bash.sh"
+fi
+
+# TODO: Check if we're actually using the rootfs git
+
+test_root
+
+orig_dir="$(pwd)"
+cd /
+
+git reset --hard origin main
+git pull
+
+cd $orig_dir
diff --git a/usr/local/bin/zio-update-rootfs b/usr/local/bin/zio-update-rootfs
deleted file mode 100755
index 73d2ff1..0000000
--- a/usr/local/bin/zio-update-rootfs
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# TODO: Check if we're actually using the rootfs git
-
-orig_dir="$(pwd)"
-cd /
-
-git reset --hard
-git pull
-
-cd $orig_dir