From b865f8cbc9c73fdf27264af8e495063bca35b2a5 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Thu, 5 Aug 2021 10:24:50 -0400 Subject: [PATCH] Update set-env-vars to append to, instead of overwiting zipr-plugin-path env var. --- set_env_vars | 2 +- zipr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/set_env_vars b/set_env_vars index c791f3443..b8e8cdbf2 100755 --- a/set_env_vars +++ b/set_env_vars @@ -14,6 +14,7 @@ export ZEST_RUNTIME=$PEASOUP_HOME/zest_runtime # don't override pspath # add us to the pspath export PSPATH=$PSPATH:$PEASOUP_HOME/irdb-libs/plugins_install +export ZIPR_PLUGIN_PATH=$ZIPR_PLUGIN_PATH:$PEASOUP_HOME/zipr_install/plugins if [[ -z $PS_INSTALL ]]; then @@ -37,7 +38,6 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZEST_RUNTIME/lib32:$ZEST_RUNTIME/lib64 # deprecated: going away soon. export SECURITY_TRANSFORMS_HOME=$PEASOUP_HOME/irdb-libs -export ZIPR_PLUGIN_PATH=$PEASOUP_HOME/zipr_install/plugins export PEASOUP_UMBRELLA_DIR=$PEASOUP_HOME diff --git a/zipr b/zipr index 177363ad4..13d83395e 160000 --- a/zipr +++ b/zipr @@ -1 +1 @@ -Subproject commit 177363ad46ad91861030e0088857269ae55dcf40 +Subproject commit 13d83395e674c3c5f085f06235726f216ab47bb5 -- GitLab