Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed May 4, 2024
1 parent 85e2a58 commit a3320f2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 15 deletions.
15 changes: 3 additions & 12 deletions HelperResources/forSetupScript
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
#### add the following lines to the package's setup script
#### following lines incorporate helper resources into this script
pkgDir=$( dirname $0 )
pkgName=$( basename $pkgDir )
pkgRoot=$( dirname $pkgDir )
if [ -e "$pkgDir/HelperResources/IncludeHelpers" ]; then
source "$pkgDir/HelperResources/IncludeHelpers"
elif [ -e "$pkgRoot/SetupHelper/HelperResources/IncludeHelpers" ]; then
source "$pkgRoot/SetupHelper/HelperResources/IncludeHelpers"
else
echo "$pkgName: helper resources not found - can't continue" | tee -a "/data/log/SetupHelper"
exit 1
fi

#### following line incorporates helper resources into this script
source "/data/SetupHelper/HelperResources/IncludeHelpers"
#### end of lines to include helper resources
2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.0~32
v8.0~33
2 changes: 1 addition & 1 deletion updatePackage
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,7 @@ for package in $packageList; do
deleteNestedDirectories "$sourceFiles"
mv "$workingFiles" "$sourceFiles"
fi
if [ -e "$sourceDirectory/HelperResources" ] && [ "$package" != "SetupHelper"]; then
if [ -e "$sourceDirectory/HelperResources" ] && [ "$package" != "SetupHelper" ]; then
logMessage "$package: removing HelperResources"
deleteNestedDirectories "$sourceDirectory/HelperResources"
fi
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.0~32
v8.0~33

0 comments on commit a3320f2

Please sign in to comment.