From 0339f3f4f57ea93d1119a76ea82ac7b684b6ec26 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Fri, 4 Dec 2020 19:38:40 +0100
Subject: [PATCH] fix: update script

there is a new way of grabbing the mainsail and fluidd version without reading them from a version file kiauh created in the past.
---
 resources/autocommit.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/autocommit.sh b/resources/autocommit.sh
index ea2948e..3115752 100755
--- a/resources/autocommit.sh
+++ b/resources/autocommit.sh
@@ -29,22 +29,24 @@
 grab_version(){
   if [ ! -z "$klipper_folder" ]; then
     cd "$klipper_folder"
-    klipper_commit=$(git rev-parse --short=8 HEAD)
+    klipper_commit=$(git rev-parse --short=7 HEAD)
     m1="Klipper on commit: $klipper_commit"
-    cd ${HOME}
+    cd ..
   fi
   if [ ! -z "$moonraker_folder" ]; then
     cd "$moonraker_folder"
-    moonraker_commit=$(git rev-parse --short=8 HEAD)
+    moonraker_commit=$(git rev-parse --short=7 HEAD)
     m2="Moonraker on commit: $moonraker_commit"
-    cd ${HOME}
+    cd ..
   fi
-  if [ ! -z "$mainsail_folder" ] && [ -f $mainsail_folder/version ]; then
-    mainsail_ver=$(head -n 1 $mainsail_folder/version)
+  if [ ! -z "$mainsail_folder" ]; then
+    mainsail_file=$(find $mainsail_folder/js -name "app.*.js" 2>/dev/null)
+    mainsail_ver=$(grep -o -E 'state:{packageVersion:.+' $mainsail_file | cut -d'"' -f2)
     m3="Mainsail version: $mainsail_ver"
   fi
-  if [ ! -z "$fluidd_folder" ] && [ -f $mainsail_folder/version ]; then
-    fluidd_ver=$(head -n 1 $fluidd_folder/version)
+  if [ ! -z "$fluidd_folder" ]; then
+    fluidd_file=$(find $fluidd_folder/js -name "app.*.js" 2>/dev/null)
+    fluidd_ver=$(grep -o -E '"setVersion",".+"' $fluidd_file | cut -d'"' -f4)
     m4="Fluidd version: $fluidd_ver"
   fi
 }
@@ -59,4 +61,4 @@ push_config(){
 }
 
 grab_version
-push_config
\ No newline at end of file
+push_config