diff --git a/HelperResources/forSetupScript b/HelperResources/forSetupScript index ba2ef04..d813879 100644 --- a/HelperResources/forSetupScript +++ b/HelperResources/forSetupScript @@ -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 diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion index 9df9892..84b2f94 100644 --- a/blindInstall/SetupHelperVersion +++ b/blindInstall/SetupHelperVersion @@ -1 +1 @@ -v8.0~32 +v8.0~33 diff --git a/updatePackage b/updatePackage index 2f06b29..1e92cc7 100755 --- a/updatePackage +++ b/updatePackage @@ -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 diff --git a/venus-data-UninstallPackages.tgz b/venus-data-UninstallPackages.tgz index ac01c89..c9598b9 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 78d7a32..73b799e 100644 Binary files a/venus-data.tgz and b/venus-data.tgz differ diff --git a/version b/version index 9df9892..84b2f94 100644 --- a/version +++ b/version @@ -1 +1 @@ -v8.0~32 +v8.0~33