[GitHub] jasonpet closed pull request #292: make install of deprecated packages optional

[GitBox <gi...@apache.org>]

jasonpet closed pull request #292: make install of deprecated packages optional
URL: https://github.com/apache/incubator-openwhisk-catalog/pull/292
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
index cc02cc6..ca09421 100755
--- a/packages/installCatalog.sh
+++ b/packages/installCatalog.sh
@@ -35,13 +35,11 @@ echo Installing OpenWhisk packages
 
 if [ $SKIP_DEPRECATED_PACKAGES == "false" ]; then
     runPackageInstallScript "$SCRIPTDIR" installCombinators.sh
+    runPackageInstallScript "$SCRIPTDIR" installGit.sh
+    runPackageInstallScript "$SCRIPTDIR" installWatson.sh
 fi
-runPackageInstallScript "$SCRIPTDIR" installGit.sh
 runPackageInstallScript "$SCRIPTDIR" installSlack.sh
 runPackageInstallScript "$SCRIPTDIR" installSystem.sh
-if [ $SKIP_DEPRECATED_PACKAGES == "false" ]; then
-    runPackageInstallScript "$SCRIPTDIR" installWatson.sh
-fi
 runPackageInstallScript "$SCRIPTDIR" installWeather.sh
 runPackageInstallScript "$SCRIPTDIR" installWebSocket.sh
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services