saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Take care of whitespace when parsing versions.

Browse source 
Installing from git on Ubuntu without installing from package first.
This commit is contained in:
Pedro Algarvio 2012-10-27 04:51:54 +01:00
parent b919d276ac
commit a856f5a573
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrap-salt-minion.sh
View file

@ -225,9 +225,7 @@ __gather_linux_system_info() {
[ ! -f "/etc/${rsource}" ] && continue
n=$(echo ${rsource} | sed -e 's/[_-]release$//' -e 's/[_-]version$//')
v=$(__parse_version_string $(
(grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q'
))
v=$(__parse_version_string "$((grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q')")
case $(echo ${n} | tr '[:upper:]' '[:lower:]') in
redhat )
if [ ".$(egrep '(Red Hat Enterprise Linux|CentOS)' /etc/${rsource})" != . ]; then
@ -422,7 +420,7 @@ install_ubuntu_git_deps() {
apt-get install -y python-software-properties
add-apt-repository ppa:saltstack/salt
apt-get update
apt-get install -y salt-minion git-core
apt-get install -y git python-yaml python-m2crypto python-crypto msgpack-python python-zmq python-jinja2
}
install_ubuntu_1110_post() {
@ -438,8 +436,6 @@ install_ubuntu_daily() {
}
install_ubuntu_git() {
rm -rf /usr/share/pyshared/salt*
rm -rf /usr/bin/salt-*
mkdir -p /root/git
cd /root/git
git clone git://github.com/saltstack/salt.git
@ -449,6 +445,11 @@ install_ubuntu_git() {
}
install_ubuntu_git_post() {
for fname in $(echo "minion master syndic"); do
cp /root/git/salt/debian/salt-$fname.init /etc/init.d/salt-$fname
cp /root/git/salt/debian/salt-$fname.upstart /etc/init/salt-$fname.conf
chmod +x /etc/init.d/salt-$fname
done
service salt-minion start
}
#