diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index b4c165bd25598d45ebe205f6cdd70ff39c35ec05..01201ac355add40db50fb7729840774bd80f07ce 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -1,5 +1,5 @@ Name: nsd-app-wrap -Version: 2.01 +Version: 2.02 Release: 1%{?dist} Summary: Wrapper scripts to launch python applications installed via anaconda Vendor: Peter F. Peterson diff --git a/src/nsd-app-wrap.sh b/src/nsd-app-wrap.sh index d305d30f717afe6382f19a49effd135f78881c6b..ee3ef12b424c1f68358ef162b35b3f72b91d120c 100755 --- a/src/nsd-app-wrap.sh +++ b/src/nsd-app-wrap.sh @@ -97,3 +97,26 @@ activate_and_launch() { echo "Execute: ${COMMAND} $*" "${COMMAND}" "$@" } + +pixi_launch() { + PIXI_PREFIX="/usr/local/pixi" + PIXI_ENV="${1}" + shift + + # This grabs everything past the first argument + PIXI_TASK="${@}" + + path_to_manifest="${PIXI_PREFIX%/}/${PIXI_ENV}" + + #echo "P: $PIXI_PREFIX, E: $PIXI_ENV, T: $PIXI_TASK - ptm: $path_to_manifest." + + _remove_font_cache + + pixi_run="pixi run --frozen --manifest-path $path_to_manifest $PIXI_TASK" + + #echo "pixi command: $pixi_run" + + $pixi_run + +} + diff --git a/src/quicknxs b/src/quicknxs index 37047cc6db1ca04611c9b055c844eb93cfa5e792..c01d79cd8347c7efbca9702d187436304a9fafa0 100644 --- a/src/quicknxs +++ b/src/quicknxs @@ -2,13 +2,13 @@ # select the environment to use # current default is system version -CONDA_ENVIRON=quicknxs +PIXI_ENVIRON=quicknxs if [ -n "$1" ]; then if [ "$1" == "--dev" ]; then - CONDA_ENVIRON=quicknxs-dev + PIXI_ENVIRON=quicknxs_dev shift # drop this argument elif [ "$1" == "--qa" ]; then - CONDA_ENVIRON=quicknxs-qa + PIXI_ENVIRON=quicknxs_qa shift # drop this argument fi fi @@ -18,6 +18,7 @@ fi . "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" \ || . /bin/nsd-app-wrap.sh # put together arguments - conda_env, application, argv -args=("${CONDA_ENVIRON}" "quicknxs-gui" "$@") +args=("${PIXI_ENVIRON}" "start_gui" "$@") # launch the tool -activate_and_launch "${args[@]}" +pixi_launch "${args[@]}" +