Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump build-timeout for lftools to 30 minutes
[releng/builder.git]
/
jjb
/
packaging
/
install-rpm.sh
diff --git
a/jjb/packaging/install-rpm.sh
b/jjb/packaging/install-rpm.sh
index 6112a2a78d7d27b5bad180cc3431e38e71db6bc6..7c011ad646f46e7cc69a36448d2052e124e47169 100644
(file)
--- a/
jjb/packaging/install-rpm.sh
+++ b/
jjb/packaging/install-rpm.sh
@@
-17,7
+17,7
@@
if [ -f /usr/bin/yum ]; then
# NB: Paths must be anchored at root
if [[ $URL == /* ]]; then
# If path is globbed (/path/to/*.rpm), expand it
# NB: Paths must be anchored at root
if [[ $URL == /* ]]; then
# If path is globbed (/path/to/*.rpm), expand it
- path=$(sudo find / -wholename
$URL
)
+ path=$(sudo find / -wholename
"$URL"
)
sudo yum install -y "$path"
elif [[ $URL == *.rpm ]]; then
sudo yum install -y "$URL"
sudo yum install -y "$path"
elif [[ $URL == *.rpm ]]; then
sudo yum install -y "$URL"
@@
-35,7
+35,7
@@
elif [ -f /usr/bin/zypper ]; then
# NB: Paths must be anchored at root
if [[ $URL == /* ]]; then
# If path is globbed (/path/to/*.rpm), expand it
# NB: Paths must be anchored at root
if [[ $URL == /* ]]; then
# If path is globbed (/path/to/*.rpm), expand it
- path=$(sudo find /root -wholename
$URL
)
+ path=$(sudo find /root -wholename
"$URL"
)
sudo zypper -n --no-gpg-checks install "$path"
elif [[ $URL == *.rpm ]]; then
sudo zypper -n --no-gpg-checks install "$URL"
sudo zypper -n --no-gpg-checks install "$path"
elif [[ $URL == *.rpm ]]; then
sudo zypper -n --no-gpg-checks install "$URL"