another setup script bug fix

kwindrem · Nov 17, 2021 · 93fffb0 · 93fffb0
1 parent 3611c6a
commit 93fffb0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/setup b/setup
@@ -34,19 +34,6 @@ if [ $scriptAction == 'NONE' ] ; then
     # NOTE: if new settings are added in the future, change test for that one
     # to avoid creating that new parameter !!!!
 
-    dbus-send --system --print-reply=literal --dest=com.victronenergy.settings /Settings/PackageVersion/CheckingPackage\
-            com.victronenergy.BusItem.GetValue &> /dev/null
-    if (( $? != 0 )); then
-        logMessage "creating SetupHelper Settings"
-        dbus -y com.victronenergy.settings /Settings AddSettings\
-            '%[ {"path": "/PackageVersion/GitHubAutoUpdate", "default":0},\
-                {"path": "/PackageVersion/CheckingPackage", "default":""},]'  > /dev/null
-        # relocate options and current values
-        moveSetting "$setupOptionsDir/autoGitHubUpdate" "/Settings/GuiMods/GitHubAutoUpdate" "/PackageVersion/GitHubAutoUpdate"
-        rm -f "$setupOptionsDir/autoGitHubUpdate"
-        moveSetting "" "/Settings/GuiMods/CheckingPackage" "/PackageVersion/CheckingPackage"
-    fi
-
     # display initial message
     echo
     echo "This package provides support functions and utilities for Venus modification packages"
@@ -164,6 +151,20 @@ if [ $scriptAction == 'INSTALL' ] ; then
         cp "$scriptDir/defaultPackageList" "$packageListFile"
     fi
 
+    dbus-send --system --print-reply=literal --dest=com.victronenergy.settings /Settings/PackageVersion/CheckingPackage\
+            com.victronenergy.BusItem.GetValue &> /dev/null
+    if (( $? != 0 )); then
+        logMessage "creating SetupHelper Settings"
+        dbus -y com.victronenergy.settings /Settings AddSettings\
+            '%[ {"path": "/PackageVersion/GitHubAutoUpdate", "default":0},\
+                {"path": "/PackageVersion/CheckingPackage", "default":""},]'  > /dev/null
+        # relocate options and current values
+        moveSetting "$setupOptionsDir/autoGitHubUpdate" "/Settings/GuiMods/GitHubAutoUpdate" "/PackageVersion/GitHubAutoUpdate"
+        rm -f "$setupOptionsDir/autoGitHubUpdate"
+        moveSetting "" "/Settings/GuiMods/CheckingPackage" "/PackageVersion/CheckingPackage"
+    fi
+
+
     updateActiveFile "$qmlDir/PageSettings.qml"
     updateActiveFile "$qmlDir/PageSettingsPackageControl.qml"
     updateActiveFile "$qmlDir/PageSettingsPackageVersions.qml"

diff --git a/venus-data.tgz b/venus-data.tgz
diff --git a/version b/version
@@ -1 +1 @@
-v3.6
+v3.7