Release 1.2

3 files changed, 55 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00f842ed93e9..7af5f5cd9f66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = gogios-bin
 	pkgdesc = Checks to see if required services are still running on important machines.
-	pkgver = 1.1
-	pkgrel = 4
+	pkgver = 1.2
+	pkgrel = 5
 	url = https://angrysysadmins.tech
 	install = gogios-bin.install
 	arch = x86_64
 	license = MIT
-	depends = dotnet-sdk
-	depends = dotnet-runtime
-	depends = dotnet-host
 	optdepends = nginx
-	noextract = gogios-1.1.deb
+	noextract = gogios-1.2.deb
 	options = !strip
 	options = !emptydirs
-	source = https://github.com/BKasin/Gogios/releases/download/v1.1/gogios-1.1.deb
-	sha256sums = 4428ca37a4a4ff709dd1f1fba1615784556710a0f18717142445e3105e1f82fe
+	source = https://github.com/BKasin/Gogios/releases/download/v1.2/gogios-1.2.deb
+	sha256sums = d0c81333c952ec507802d9a1e36cf3ce9d071a18e09a1d3f158dcd2108c8bc6e
 
 pkgname = gogios-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 749bd2ff62fc..e1a7886a108a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,18 @@
 # Maintainer: Bailey Kasin <bailey@gingertechnology.net> (https://angrysysadmins.tech)
 
 pkgname=gogios-bin
-pkgver=1.1
-pkgrel=4
+pkgver=1.2
+pkgrel=5
 pkgdesc="Checks to see if required services are still running on important machines."
 arch=('x86_64')
 url="https://angrysysadmins.tech"
 license=('MIT')
-depends=(
-    'dotnet-sdk'
-    'dotnet-runtime'
-    'dotnet-host'
-)
 optdepends=('nginx')
 source=("https://github.com/BKasin/Gogios/releases/download/v${pkgver}/gogios-${pkgver}.deb")
 options=('!strip' '!emptydirs')
 install=${pkgname}.install
 noextract=("gogios-${pkgver}.deb")
-sha256sums=('4428ca37a4a4ff709dd1f1fba1615784556710a0f18717142445e3105e1f82fe')
+sha256sums=('d0c81333c952ec507802d9a1e36cf3ce9d071a18e09a1d3f158dcd2108c8bc6e')
 
 package() {
     bsdtar -O -xf gogios-${pkgver}.deb data.tar.xz | bsdtar -C "${pkgdir}" -xJf -
diff --git a/gogios-bin.install b/gogios-bin.install
index 58ff1163cf9d..bc945ad07ba4 100644
--- a/gogios-bin.install
+++ b/gogios-bin.install
@@ -1,50 +1,55 @@
 post_install() {
-        if [ ! -f /etc/gingertechengine/checks.json ]; then
-                echo "Making default check file"
-                mv /etc/gingertechengine/example.json /etc/gingertechengine/checks.json
-        fi
-
-        if id "gogios" >/dev/null 2>&1; then
-                echo "gogios user already exists"
-        else
-                useradd --system --no-create-home --shell /sbin/nologin gogios
-        fi
-
-        chown gogios:gogios -R /var/log/gingertechnology
-        chown gogios:gogios -R /var/lib/gingertechengine
-        chown gogios:gogios -R /etc/gingertechengine
-        
-        echo "Start gogios and gogios-web for the system to run."
+    if [ ! -f /etc/gingertechengine/checks.json ]; then
+        echo "Making default check file"
+        mv /etc/gingertechengine/example.json /etc/gingertechengine/checks.json
+    fi
+    
+    if id "gogios" >/dev/null 2>&1; then
+        echo "gogios user already exists"
+    else
+        useradd --system --no-create-home --shell /sbin/nologin gogios
+    fi
+    
+    chown gogios:gogios -R /var/log/gingertechnology
+    chown gogios:gogios -R /var/lib/gingertechengine
+    chown gogios:gogios -R /etc/gingertechengine
+    chown gogios:gogios -R /opt/gingertechengine
+    
+    echo "Start gogios for the system to run."
+    echo "You will need to install and a webserver and have it point to /opt/gingertechengine"
 }
 
 post_upgrade() {
-        post_install
-
-        if systemctl is-enabled gogios.service; then
-                echo "Temporarily disabling gogios"
-                systemctl disable gogios.service
-                rm /etc/systemd/system/gogios.service
-                systemctl enable gogios.service
-        fi
-
-        if systemctl is-enabled gogios-web.service; then
-                echo "Temporarily disabling gogios-web"
-                systemctl disable gogios-web.service
-                rm /etc/systemd/system/gogios-web.service
-                systemctl enable gogios-web.service
-        fi
-
-        systemctl stop gogios-web
-        systemctl stop gogios
-        systemctl start gogios-web
-        systemctl start gogios
+    post_install
+    
+    if systemctl is-enabled gogios.service; then
+        echo "Temporarily disabling gogios"
+        systemctl disable gogios.service
+        rm /etc/systemd/system/gogios.service
+        systemctl enable gogios.service
+    fi
+    
+    if systemctl is-enabled gogios-web.service; then
+        echo "Disabling gogios-web"
+        systemctl disable gogios-web.service
+        systemctl stop gogios-web.service
+    fi
+
+    if [ ! -f /opt/site/wwwroot/js/current.json ]; then
+        mv /opt/site/wwwroot/js/current.json /opt/gingertechengine/js/current.json
+    fi
+    
+    systemctl stop gogios-web
+    systemctl stop gogios
+    systemctl start gogios-web
+    systemctl start gogios
 }
 
 pre_remove() {
-        systemctl stop gogios-web
-        systemctl stop gogios
-        systemctl disable gogios-web
-        systemctl disable gogios
-
-        userdel gogios
+    systemctl stop gogios-web
+    systemctl stop gogios
+    systemctl disable gogios-web
+    systemctl disable gogios
+    
+    userdel gogios
 }