Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use os-release for opensuse info
[ci-management.git]
/
jjb
/
scripts
/
packagecloud_push.sh
diff --git
a/jjb/scripts/packagecloud_push.sh
b/jjb/scripts/packagecloud_push.sh
index
c38d03b
..
c37ac55
100644
(file)
--- a/
jjb/scripts/packagecloud_push.sh
+++ b/
jjb/scripts/packagecloud_push.sh
@@
-8,11
+8,11
@@
echo "STARTING PACKAGECLOUD PUSH"
sleep 10
if [ -f /usr/bin/zypper ]; then
sleep 10
if [ -f /usr/bin/zypper ]; then
- echo "Since zypper exists, us it to install facter"
- zypper -n install facter
+ FACTER_OS="openSUSE"
+else
+ FACTER_OS=$(/usr/bin/facter operatingsystem)
fi
fi
-FACTER_OS=$(/usr/bin/facter operatingsystem)
if [ -f ~/.packagecloud ]; then
case "$FACTER_OS" in
Ubuntu)
if [ -f ~/.packagecloud ]; then
case "$FACTER_OS" in
Ubuntu)
@@
-26,10
+26,11
@@
if [ -f ~/.packagecloud ]; then
RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
package_cloud push "${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS}
;;
RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
package_cloud push "${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS}
;;
- OpenSuSE)
- FACTER_OSREL=$(/usr/bin/facter operatingsystemrelease)
+ openSUSE)
+ # Use /etc/os-release on openSUSE to get $VERSION
+ . /etc/os-release
RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
- package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${
FACTER_OSREL
}/" ${RPMS}
+ package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${
VERSION
}/" ${RPMS}
;;
esac
fi
;;
esac
fi