Skip to content

Commit

Permalink
fixed: GUI restart doesn't always occur after install; fixed: previou…
Browse files Browse the repository at this point in the history
…is patches file creation fails on first install because root fs was stil read only
  • Loading branch information
kwindrem committed Aug 20, 2024
1 parent 41eff0f commit c59ff5b
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 20 deletions.
35 changes: 18 additions & 17 deletions HelperResources/CommonResources
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion HelperResources/version

This file was deleted.

2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.14
v8.15
5 changes: 5 additions & 0 deletions changes
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
Binary file modified venus-data-UninstallPackages.tgz
Binary file not shown.
Binary file modified venus-data.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.14
v8.15

0 comments on commit c59ff5b

Please sign in to comment.