diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources index a2c87b9..9b7036b 100755 --- a/HelperResources/CommonResources +++ b/HelperResources/CommonResources @@ -1201,7 +1201,8 @@ endScript () fi fi #### TODO: add gui v2 - if $restartGui ; then + # restart GUI if not doing a reboot below + if $restartGui && ! $rebootNeeded && ! $deferReboot; then if $userInteraction ; then if yesNoPrompt "Restart the GUI now (y) or issue a do it manually later (n): " ; then restartGuiV1Service @@ -1433,22 +1434,6 @@ getFileLists "$pkgFileSets" # tempFileDir is removed in the exit trap above but it is in volatile storage so will be removed on boot anyway tempFileDir=$( mktemp -d ) -# patch files previously used to patch a file are stored in /etc/venus -# so they track the selected root fs and are erased when Venus OS is updated -previousPatchesRoot="/etc/venus/previousPatches" -previousPatchesDir="$previousPatchesRoot/$packageName" -if ! [ -e "$previousPatchesDir" ]; then - mkdir -p "$previousPatchesDir" -fi -# relocate previous patch files -oldPreviousPatchesDir="$setupOptionsDir/previousPatches" -if [ -e "$oldPreviousPatchesDir" ]; then - logMessage "relocating previous patches" - mv "$oldPreviousPatchesDir"/* "$previousPatchesDir" - rm -rf "$oldPreviousPatchesDir" -fi -unset oldPreviousPatchesDir - # do install pre-checks - skip if uninstalling if [ $scriptAction != 'UNINSTALL' ]; then @@ -1681,6 +1666,22 @@ fi updateRootToReadWrite +# patch files previously used to patch a file are stored in /etc/venus +# so they track the selected root fs and are erased when Venus OS is updated +previousPatchesRoot="/etc/venus/previousPatches" +previousPatchesDir="$previousPatchesRoot/$packageName" +if ! [ -e "$previousPatchesDir" ]; then + mkdir -p "$previousPatchesDir" +fi +# relocate previous patch files +oldPreviousPatchesDir="$setupOptionsDir/previousPatches" +if [ -e "$oldPreviousPatchesDir" ]; then + logMessage "relocating previous patches" + mv "$oldPreviousPatchesDir"/* "$previousPatchesDir" + rm -rf "$oldPreviousPatchesDir" +fi +unset oldPreviousPatchesDir + # done with pre checks # prior to this no system mofications have been made # after this system modifications may occur diff --git a/HelperResources/version b/HelperResources/version deleted file mode 120000 index 1748d5b..0000000 --- a/HelperResources/version +++ /dev/null @@ -1 +0,0 @@ -../version \ No newline at end of file diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion index 3392718..9235dd0 100644 --- a/blindInstall/SetupHelperVersion +++ b/blindInstall/SetupHelperVersion @@ -1 +1 @@ -v8.14 +v8.15 diff --git a/changes b/changes index eb5732d..9724103 100644 --- a/changes +++ b/changes @@ -1,3 +1,8 @@ +v8.15: + fixed: GUI restart doesn't always occur after install + fixed: previouis patches file creation fails on first install + because root fs was stil read only + v8.14: fixed: crash when installing packages (introduced in v8.11) diff --git a/venus-data-UninstallPackages.tgz b/venus-data-UninstallPackages.tgz index 0857aae..89c75b4 100644 Binary files a/venus-data-UninstallPackages.tgz and b/venus-data-UninstallPackages.tgz differ diff --git a/venus-data.tgz b/venus-data.tgz index 97ccb2d..4d3fd46 100644 Binary files a/venus-data.tgz and b/venus-data.tgz differ diff --git a/version b/version index 3392718..9235dd0 100644 --- a/version +++ b/version @@ -1 +1 @@ -v8.14 +v8.15