Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix rpm #17

Merged
merged 1 commit into from
Feb 15, 2024
Merged

fix rpm #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3
3.0.1
19 changes: 11 additions & 8 deletions install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail

script_path=$(dirname "$(readlink -f "$BASH_SOURCE")")
version=(cat "$script_path/VERSION")
version=$(cat "$script_path/VERSION")

function usage {
echo "uenv installer"
Expand Down Expand Up @@ -93,11 +93,11 @@ do
exit 0
;;
*)
echo "Error: unknown argument $arg"
echo
usage
exit 1
;;
echo "Error: unknown argument $arg"
echo
usage
exit 1
;;
esac
done

Expand All @@ -123,14 +123,17 @@ echo "local install: $local_install"
if [ "$local_install" == "no" ]
then
init_path="${destdir}/etc/profile.d/uenv.sh"
impl_path="${destdir}${prefix}/libexec/uenv-impl"
impl_path="${prefix}/libexec/uenv-impl"
impl_path_install="${destdir}/${impl_path}"

else
init_path="${prefix}/bin/activate-uenv"
impl_path="${prefix}/libexec/uenv-impl"
impl_path_install="${impl_path}"
fi

echo "installing $impl_path"
run install -D -m755 <(sed "s|@@version@@|$version|g" $script_path/uenv-impl) $impl_path
run install -D -m755 <(sed "s|@@version@@|$version|g" $script_path/uenv-impl) $impl_path_install

echo "installing $init_path"
run install -D -m644 <(
Expand Down
2 changes: 1 addition & 1 deletion rpm/uenv.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ A command line interface for interacting with user environments on Alps at CSCS.
./install --yes --destdir=%{buildroot} --prefix=/opt/cscs

%files
/opt/cscs/uenv
/opt/cscs/uenv/
/etc/profile.d/uenv.sh
Loading