From c73ef1046598a6d468dec6602f5ce64cc9542985 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Mon, 12 Jan 2026 11:48:00 -0500 Subject: [PATCH] Run dos2unix to fix eol and let bash parse the file --- rpm/nsd-app-wrap.spec | 2 +- src/nexpy | 48 +++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) mode change 100644 => 100755 src/nexpy diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index 9ff6454..6d7cedb 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -1,5 +1,5 @@ Name: nsd-app-wrap -Version: 2.19 +Version: 2.20 Release: 1%{?dist} Summary: Wrapper scripts to launch python applications installed via anaconda Vendor: Peter F. Peterson diff --git a/src/nexpy b/src/nexpy old mode 100644 new mode 100755 index 8d8dce9..c54dcbf --- a/src/nexpy +++ b/src/nexpy @@ -1,24 +1,24 @@ -#!/bin/bash - -# select the environment to use -# current default is system version -PIXI_ENVIRON=nexpy -if [ -n "$1" ]; then - if [ "$1" == "--dev" ]; then - PIXI_ENVIRON=nexpy_dev - shift # drop this argument - elif [ "$1" == "--qa" ]; then - PIXI_ENVIRON=nexpy_qa - shift # drop this argument - fi -fi - -# import library to do the real work -# shellcheck disable=SC1091 -. "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" || - . /bin/nsd-app-wrap.sh - -# put together arguments - conda_env, application, argv -args=("${PIXI_ENVIRON}" "nexpy" "$@") -# launch the tool -pixi_launch "${args[@]}" +#!/bin/bash + +# select the environment to use +# current default is system version +PIXI_ENVIRON=nexpy +if [ -n "$1" ]; then + if [ "$1" == "--dev" ]; then + PIXI_ENVIRON=nexpy_dev + shift # drop this argument + elif [ "$1" == "--qa" ]; then + PIXI_ENVIRON=nexpy_qa + shift # drop this argument + fi +fi + +# import library to do the real work +# shellcheck disable=SC1091 +. "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" || + . /bin/nsd-app-wrap.sh + +# put together arguments - conda_env, application, argv +args=("${PIXI_ENVIRON}" "nexpy" "$@") +# launch the tool +pixi_launch "${args[@]}" -- GitLab