rpms/rpm-mpi-hooks
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add quotes around strings which may contain spaces

Browse Source
This commit is contained in:
Sandro Mani 2016-01-08 15:41:21 +01:00
parent b3d7787ad4
commit f22d4de92f
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mpi.prov
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2015 Sandro Mani <manisandro@gmail.com> # Copyright (c) 2015-2016 Sandro Mani <manisandro@gmail.com>
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # of this software and associated documentation files (the "Software"), to deal
@ -65,7 +65,7 @@ if [ -x /usr/lib/rpm/elfdeps -a -n "$filelist" ]; then
# Get the default provides string from elfdeps # Get the default provides string from elfdeps
prov=$(echo $file | /usr/lib/rpm/elfdeps --provides $elfdepsargs) prov=$(echo $file | /usr/lib/rpm/elfdeps --provides $elfdepsargs)
if [ -z $prov ]; then if [ -z "$prov" ]; then
continue continue
fi fi

6
mpi.req
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2015 Sandro Mani <manisandro@gmail.com> # Copyright (c) 2015-2016 Sandro Mani <manisandro@gmail.com>
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # of this software and associated documentation files (the "Software"), to deal
@ -91,11 +91,11 @@ if [ -x /usr/lib/rpm/elfdeps -a -n "$filelist" ]; then
# If the scanned binary is inside an mpi dir, for each dependency, check # If the scanned binary is inside an mpi dir, for each dependency, check
# whether the library exists in $MPI_LIB, and if yes, append # whether the library exists in $MPI_LIB, and if yes, append
# ($MPI_COMPILER) to each requires string # ($MPI_COMPILER) to each requires string
if [ ! -z $mpi_comp ]; then if [ ! -z "$mpi_comp" ]; then
mpi_lib=${mpi_lib_for_compiler[$mpi_comp]} mpi_lib=${mpi_lib_for_compiler[$mpi_comp]}
for req in $reqs; do for req in $reqs; do
lib=$(echo $req | grep -Eo '^.*\.so[^(]*') lib=$(echo $req | grep -Eo '^.*\.so[^(]*')
if [ ! -z $lib ] && ( [ -e $mpi_lib/$lib ] || [ -e $buildroot$mpi_lib/$lib ] ); then if [ ! -z "$lib" ] && ( [ -e "$mpi_lib/$lib" ] || [ -e "$buildroot$mpi_lib/$lib" ] ); then
req="${req}($mpi_comp)" req="${req}($mpi_comp)"
fi fi
echo "$req" echo "$req"

5
rpm-mpi-hooks.spec
View File

@ -1,6 +1,6 @@
Name: rpm-mpi-hooks Name: rpm-mpi-hooks
Version: 3 Version: 3
Release: 4%{?dist} Release: 5%{?dist}
Summary: RPM dependency generator hooks for MPI packages Summary: RPM dependency generator hooks for MPI packages
License: MIT License: MIT
@ -46,6 +46,9 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req
%changelog %changelog
* Fri Jan 08 2016 Sandro Mani <manisandro@gmail.com> 3-5
- Add quotes around strings which may contain spaces
* Tue Dec 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3-4 * Tue Dec 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3-4
- Require environment(modules) - Require environment(modules)