Skip to content

Commit f4d29f9

Browse files
mohierfmohierf
committed
Closes #1038 - build separate Python 2 / 3 packages
1 parent 5640a2f commit f4d29f9

5 files changed

+189
-98
lines changed

‎.travis.yml

+55-19
Original file line numberDiff line numberDiff line change
@@ -58,37 +58,44 @@ jobs:
5858
user: alignak
5959
password:
6060
secure: "eoCeoyPlvmE1lHVA+1mi7vDXvabAttW2PE1gyEHBt4KxoiV8rutM+Ka2H6OFjJNNwk2c0XDwdpNXuM94rl8Cg2gsF7SVOcuuaJRzm2f0QIKMld0qXz5h/9H4hiCYYY4A7kmalO0/h63Dha84c7AA/gxdphPg/egMfgU/KnwpSf7Nwhbeiy+Ss2Afs5rOfC1x4A2HScKMe/MpSSnizZC/0WpRI8llZBupwb1sGVD9yclz6rzxs5it6ePgBYYpLxgV0HUPUc9efa3fNVrPme3lrXJqG9xAP152Zoh95jOaLKn6BBwf63CHt2NloKfeqs313T4Z8E7AKMcA2+GUlFlK8mD6vVl4NcVqpCb8noyDUiWb3mH4XGYkvWlWkKhSsqqGR/HkO2YjrRI+4EWt+nUVEva2ydPpKblv0ycg7su06X3nN35+OjacbHyNIBKKC/HAYMJjC/7/maCKgGRHJxoJdCsC43hdhZjjDIlpstndo6NgE9Nl4HJ+rB2sqHJXOUFwMMEvVpcGPPfj8YBVZMR9OG9EJVUsijKpq+/8KIxsyOfXXbmIEEMn7Ct9pSa4oSeo4N6VzPWggpZN9q08uolSBETCUo2mHpyVt2d0RjhcEE9kVDo6Liiv9H0EWnGJg9N2IXBQV3794Ngh1HnJNihcBSqIRC020yQkp1yDZsof34I="
61-
- stage: Debian packaging
61+
- stage: Debian packaging - python 2
62+
python: 2.7
63+
if: (tag IS blank)
64+
script:
65+
- echo "Packaging for BinTray..."
66+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION deb
67+
deploy:
68+
- provider: bintray
69+
skip_cleanup: true
70+
file: dist/.bintray-deb.json
71+
on:
72+
all_branches: true
73+
user: mohierf
74+
key:
75+
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
76+
- stage: Debian packaging - python 3
6277
python: 3.6
6378
if: (tag IS blank)
64-
install:
65-
# Install packaging requirements
66-
- echo "Installing packaging requirements..."
6779
script:
68-
- echo "Deploying to BinTray packages..."
69-
# Package Alignak for debian
80+
- echo "Packaging for BinTray..."
7081
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION deb
71-
# if: (branch IN (master, develop)) OR (tag IS present)
7282
deploy:
7383
- provider: bintray
7484
skip_cleanup: true
7585
file: dist/.bintray-deb.json
7686
on:
7787
all_branches: true
78-
# condition: $TRAVIS_BRANCH =~ ^master|develop$
7988
user: mohierf
8089
key:
8190
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
82-
- stage: RPM packaging
91+
- stage: RPM packaging - python 2
8392
python: 2.7
8493
if: (tag IS blank)
8594
install:
86-
# Install packaging requirements
8795
- echo "Installing packaging requirements..."
8896
- sudo apt-get install -y rpm
8997
script:
90-
- echo "Deploying to BinTray packages..."
91-
# Package Alignak for rpm
98+
- echo "Packaging for BinTray..."
9299
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
93100
deploy:
94101
- provider: bintray
@@ -99,22 +106,51 @@ jobs:
99106
user: mohierf
100107
key:
101108
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
102-
- stage: FreeBSD packaging
103-
python: 2.7
109+
- stage: RPM packaging - python 3
110+
python: 3.6
104111
if: (tag IS blank)
105112
install:
106-
# Install packaging requirements
107113
- echo "Installing packaging requirements..."
114+
- sudo apt-get install -y rpm
108115
script:
109-
- echo "Deploying to BinTray packages..."
110-
# Package Alignak-backend for deb/rpm
111-
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd
116+
- echo "Packaging for BinTray..."
117+
- ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION rpm
112118
deploy:
113119
- provider: bintray
114120
skip_cleanup: true
115-
file: dist/.bintray-freebsd.json
121+
file: dist/.bintray-rpm.json
116122
on:
117123
all_branches: true
118124
user: mohierf
119125
key:
120126
secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
127+
# - stage: FreeBSD packaging - python 2
128+
# python: 2.7
129+
# if: (tag IS blank)
130+
# script:
131+
# - echo "Packaging for BinTray..."
132+
# - ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd
133+
# deploy:
134+
# - provider: bintray
135+
# skip_cleanup: true
136+
# file: dist/.bintray-freebsd.json
137+
# on:
138+
# all_branches: true
139+
# user: mohierf
140+
# key:
141+
# secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="
142+
# - stage: FreeBSD packaging - python 3
143+
# python: 3.6
144+
# if: (tag IS blank)
145+
# script:
146+
# - echo "Packaging for BinTray..."
147+
# - ./package.sh $TRAVIS_BRANCH $TRAVIS_PYTHON_VERSION freebsd
148+
# deploy:
149+
# - provider: bintray
150+
# skip_cleanup: true
151+
# file: dist/.bintray-freebsd.json
152+
# on:
153+
# all_branches: true
154+
# user: mohierf
155+
# key:
156+
# secure: "xcvRMpwT+Gk0F+EpelwxSxixkrgb+XLS2310zj3j7+eQ2ahPD20yKX7sZsvIJs3DQjUtJwTemvgW6Yi7TFFJyYK9UA3csPbSojTonXUULjxLP8J3tmaioC2l0L3g+rzeVRbGdsBg5MBMgiz1xdheA3dlaoadL7UXIKx+ZiIjSIkcQJNZWUAPtgsnHGpNx94YGDv4zKp9sBm1Y34QPY8sRXRdlYfmBtp1k1wXVqiVk0K81c6PYoL7bGg9tywfZCGAlhzW0F4Dq9GsB+J1aKgT/QnNVS3HKID8W3wXmlIqGfiidECKjRgZuKcC7ayinuGTOhlitPRtlsAs55Suq7EbAUu4SF8QKV8q5wjtdVxln3zxLrJTAAG2rHQYI4JICjUtPocajZd5661IdHu/UnhqKKWcORK00zwTiQqly9Px/FN0C1qCmnz+1nZOECAQpUxUUXISgKQhYHFKCQK3V4DMryPzPsDuvq4aAIrjjzedca1QwC8FvQgRE13TyLm9wtgsCCZ2TM5moigY37Ea1Gw0leDnAnx6sN5ZERLRE59VxWjhO5O617+kuvxlOcAwkiRYtUPuCVlv00TySqKxtjlY9Rkpc1YLqiLiYJQYCm7ubcFMje9Cy6c8xzS0kTO7HBdPbfJ9ODEKHpOZLYD39iOUk/T60IWMIvsM1RhLTVr7z5Y="

‎bin/python-post-install.sh

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
#!/bin/sh
2+
3+
# --------------------------------------------------------------------------------
4+
# This script is doing the post-install processing for Alignak application:
5+
# - checking and creating alignak:alignak user account
6+
# - installing the python dependencies for Alignak.
7+
# -----
8+
# Command line parameters may be used to change the default 'alignak'
9+
# user account and the default '/usr/local' prefix
10+
# --------------------------------------------------------------------------------
11+
# Default is to use an alignak account
12+
ACCOUNT=$1
13+
# Default is to use /usr/local prefix
14+
PREFIX=$2
15+
# Parse command line arguments
16+
if [ $# -eq 0 ]; then
17+
ACCOUNT="alignak"
18+
PREFIX="/usr/local"
19+
fi
20+
if [ $# -eq 1 ]; then
21+
# Yum installer calls the post-installation script with "1"
22+
# for an initial installation oe "2" for an upgrade
23+
if [ "$1" -eq "1" ]; then
24+
ACCOUNT="alignak"
25+
PREFIX="/usr/local"
26+
fi
27+
if [ "$1" -eq "2" ]; then
28+
ACCOUNT="alignak"
29+
PREFIX="/usr/local"
30+
fi
31+
PREFIX="/usr/local"
32+
fi
33+
34+
echo "-----"
35+
echo "Alignak post-install"
36+
echo "User account: $ACCOUNT"
37+
echo "Installation prefix: $PREFIX"
38+
echo "-----"
39+
40+
echo "Detecting OS platform"
41+
platform='unknown'
42+
unamestr=`uname`
43+
echo "-> system is: $unamestr"
44+
if [ "$unamestr" = 'Linux' ]; then
45+
platform='linux'
46+
elif [ "$unamestr" = 'FreeBSD' ]; then
47+
platform='freebsd'
48+
fi
49+
echo "-> found ${platform}"
50+
51+
echo "Checking / creating '$ACCOUNT' user and users group"
52+
if id "$ACCOUNT" >/dev/null 2>&1; then
53+
echo "User $ACCOUNT still exists"
54+
else
55+
echo "User $ACCOUNT does not exist, trying to create..."
56+
if [ "$platform" = 'linux' ]; then
57+
## Create user and group
58+
echo "Creating '$ACCOUNT' user and users group"
59+
useradd $ACCOUNT --system --no-create-home --user-group -c "Alignak daemons user"
60+
elif [ "$platform" = 'freebsd' ]; then
61+
## Create user and group
62+
echo "Creating '$ACCOUNT' user and users group"
63+
pw adduser $ACCOUNT -d /nonexistent -s /usr/sbin/nologin -c "Alignak daemons user"
64+
fi
65+
fi
66+
67+
echo "Detecting Python version"
68+
pyver=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
69+
if [ "$pyver" = "2.7" ]; then
70+
echo "Python 2.7 ($pyver) detected"
71+
exe_pip=$(pip --version) 2> /dev/null
72+
if [ $? -eq 0 ]
73+
then
74+
echo "Installing python 2 packages dependencies from requirements.txt..."
75+
sudo pip install -r $PREFIX/share/alignak/requirements.txt
76+
echo "Installed."
77+
else
78+
echo "pip is not available. You can install it by typing: sudo apt install python-pip"
79+
echo "You can then run: $PREFIX/share/alignak/python-post-install.sh"
80+
exit 1
81+
fi
82+
else
83+
echo "Python 2 is not installed, exiting."
84+
exit 1
85+
fi
86+
87+
echo "Creating some necessary directories"
88+
mkdir -p $PREFIX/var/run/alignak
89+
chown -R $ACCOUNT:$ACCOUNT $PREFIX/var/run/alignak
90+
chmod -R 775 $PREFIX/var/run/alignak
91+
echo "$ACCOUNT user and members of its group $ACCOUNT are granted 775 on $PREFIX/var/run/alignak"
92+
mkdir -p $PREFIX/var/log/alignak
93+
chown -R $ACCOUNT:$ACCOUNT $PREFIX/var/log/alignak
94+
echo "$ACCOUNT user and members of its group $ACCOUNT are granted 775 on $PREFIX/var/log/alignak"
95+
chmod -R 775 $PREFIX/var/log/alignak
96+
echo "Add your own user account as a member of $ACCOUNT group to run daemons from your shell!"
97+
echo "Created."
98+
99+
echo "Installing log rotation script"
100+
cp $PREFIX/share/alignak/alignak-log-rotate /etc/logrotate.d/alignak
101+
echo "Installed."

‎bin/post-install.sh ‎bin/python3-post-install.sh

+15-31
Original file line numberDiff line numberDiff line change
@@ -68,38 +68,22 @@ echo "Detecting Python version"
6868
pyver=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:1])))') 2> /dev/null
6969
if [ $? -eq 0 ]
7070
then
71-
pyver=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') 2> /dev/null
72-
echo "Python 3 ($pyver) detected"
73-
exe_pip=$(pip3 --version) 2> /dev/null
74-
if [ $? -eq 0 ]
75-
then
76-
echo "Installing python 3 packages dependencies from requirements.txt..."
77-
sudo pip3 install -r $PREFIX/share/alignak/requirements.txt
78-
echo "Installed."
79-
else
80-
echo "pip3 is not available. You can install it by typing: sudo apt install python3-pip"
81-
echo "You can then run: sudo $PREFIX/share/alignak/post-install.sh"
82-
exit 1
83-
fi
71+
pyver=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') 2> /dev/null
72+
echo "Python 3 ($pyver) detected"
73+
exe_pip=$(pip3 --version) 2> /dev/null
74+
if [ $? -eq 0 ]
75+
then
76+
echo "Installing python 3 packages dependencies from requirements.txt..."
77+
sudo pip3 install -r $PREFIX/share/alignak/requirements.txt
78+
echo "Installed."
79+
else
80+
echo "pip3 is not available. You can install it by typing: sudo apt install python3-pip"
81+
echo "You can then run: sudo $PREFIX/share/alignak/python3-post-install.sh"
82+
exit 1
83+
fi
8484
else
85-
pyver=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
86-
if [ "$pyver" = "2.7" ]; then
87-
echo "Python 2.7 ($pyver) detected"
88-
exe_pip=$(pip --version) 2> /dev/null
89-
if [ $? -eq 0 ]
90-
then
91-
echo "Installing python 2 packages dependencies from requirements.txt..."
92-
sudo pip install -r $PREFIX/share/alignak/requirements.txt
93-
echo "Installed."
94-
else
95-
echo "pip is not available. You can install it by typing: sudo apt install python-pip"
96-
echo "You can then run: $PREFIX/share/alignak/post-install.sh"
97-
exit 1
98-
fi
99-
else
100-
echo "No valid Python version detected"
101-
exit 1
102-
fi
85+
echo "Python 3 is not installed, exiting."
86+
exit 1
10387
fi
10488

10589
echo "Creating some necessary directories"

‎package.sh

+16-47
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ systemd_service="python3/alignak.service"
6666
if [ "${python_version}" = "2.7" ]; then
6767
python_prefix="python"
6868
systemd_service="python2/alignak.service"
69+
# python_version="2"
70+
#else
71+
# python_version="3"
6972
fi
7073

7174
# Package information - no more python-prefix but kept for compatibility
72-
pkg_name="alignak"
73-
if [ "${python_version}" = "2.7" ]; then
74-
pkg_name="alignak"
75-
fi
75+
pkg_name="${python_prefix}-alignak"
7676
pkg_description="Alignak, modern Nagios compatible monitoring framework"
7777
pkg_url="http://alignak.net"
7878
pkg_team="Alignak Team (contact@alignak.net)"
@@ -91,16 +91,7 @@ if [ "${git_branch}" = "master" ]; then
9191
sed -i -e "s|\"sed_version_released\"|\"${version_date}\"|g" dist/.bintray-${output_type}.json
9292

9393
# Stable repo
94-
if [ "${output_type}" = "deb" ]; then
95-
sed -i -e "s/sed_version_repo/alignak-deb-stable/g" dist/.bintray-${output_type}.json
96-
elif [ "${output_type}" = "rpm" ]; then
97-
sed -i -e "s/sed_version_repo/alignak-rpm-stable/g" dist/.bintray-${output_type}.json
98-
elif [ "${output_type}" = "freebsd" ]; then
99-
sed -i -e "s/sed_version_repo/alignak-freebsd-stable/g" dist/.bintray-${output_type}.json
100-
else
101-
echo "Unmanaged output type: ${output_type}"
102-
exit 1
103-
fi
94+
sed -i -e "s/sed_version_repo/alignak-${output_type}-stable/g" dist/.bintray-${output_type}.json
10495
elif [ "${git_branch}" = "develop" ]; then
10596
# Version is version number + develop
10697
version="${version}-develop"
@@ -109,20 +100,11 @@ elif [ "${git_branch}" = "develop" ]; then
109100
# Updating deploy script for Alignak develop version
110101
sed -i -e "s|\"sed_package_name\"|\"${pkg_name}\"|g" dist/.bintray-${output_type}.json
111102
sed -i -e "s|\"sed_version_name\"|\"${version}-${version_date}\"|g" dist/.bintray-${output_type}.json
112-
sed -i -e "s|\"sed_version_desc\"|\"Development version\"|g" dist/.bintray-${output_type}.json
103+
sed -i -e "s|\"sed_version_desc\"|\"Development version for ${python_prefix}\"|g" dist/.bintray-${output_type}.json
113104
sed -i -e "s|\"sed_version_released\"|\"${version_date}\"|g" dist/.bintray-${output_type}.json
114105

115-
# Testing repo
116-
if [ "${output_type}" = "deb" ]; then
117-
sed -i -e "s/sed_version_repo/alignak-deb-testing/g" dist/.bintray-${output_type}.json
118-
elif [ "${output_type}" = "rpm" ]; then
119-
sed -i -e "s/sed_version_repo/alignak-rpm-testing/g" dist/.bintray-${output_type}.json
120-
elif [ "${output_type}" = "freebsd" ]; then
121-
sed -i -e "s/sed_version_repo/alignak-freebsd-testing/g" dist/.bintray-${output_type}.json
122-
else
123-
echo "Unmanaged output type: ${output_type}"
124-
exit 1
125-
fi
106+
# Use the testing repo
107+
sed -i -e "s/sed_version_repo/alignak-${output_type}-testing/g" dist/.bintray-${output_type}.json
126108
else
127109
# Version is version number + branch name
128110
version="${version}-${git_branch}"
@@ -131,20 +113,11 @@ else
131113
# Updating deploy script for any other branch / tag
132114
sed -i -e "s|\"sed_package_name\"|\"${pkg_name}\"|g" dist/.bintray-${output_type}.json
133115
sed -i -e "s|\"sed_version_name\"|\"${version}-${version_date}\"|g" dist/.bintray-${output_type}.json
134-
sed -i -e "s|\"sed_version_desc\"|\"Branch $1 version\"|g" dist/.bintray-${output_type}.json
116+
sed -i -e "s|\"sed_version_desc\"|\"Branch $1 version for ${python_prefix}\"|g" dist/.bintray-${output_type}.json
135117
sed -i -e "s|\"sed_version_released\"|\"${version_date}\"|g" dist/.bintray-${output_type}.json
136118

137-
# Testing repo
138-
if [ "${output_type}" = "deb" ]; then
139-
sed -i -e "s/sed_version_repo/alignak-deb-testing/g" dist/.bintray-${output_type}.json
140-
elif [ "${output_type}" = "rpm" ]; then
141-
sed -i -e "s/sed_version_repo/alignak-rpm-testing/g" dist/.bintray-${output_type}.json
142-
elif [ "${output_type}" = "freebsd" ]; then
143-
sed -i -e "s/sed_version_repo/alignak-freebsd-testing/g" dist/.bintray-${output_type}.json
144-
else
145-
echo "Unmanaged output type: ${output_type}"
146-
exit 1
147-
fi
119+
# Use the testing repo
120+
sed -i -e "s/sed_version_repo/alignak-${output_type}-testing/g" dist/.bintray-${output_type}.json
148121
fi
149122

150123
echo "----------"
@@ -177,13 +150,11 @@ if [ "${output_type}" = "deb" ]; then
177150
--maintainer "${pkg_team}" \
178151
--python-package-name-prefix "${python_prefix}" \
179152
--python-scripts-executable "/usr/bin/env python" \
180-
--python-install-lib "/usr/lib/${python_prefix}/dist-packages" \
181-
--python-bin 'python' \
182-
--python-pip 'pip' \
153+
--python-install-lib "/usr/local/lib/python${python_version}/site-packages" \
183154
--python-install-data '/usr/local' \
184155
--python-install-bin '/usr/local/bin' \
185156
--no-python-dependencies \
186-
--after-install './bin/post-install.sh' \
157+
--after-install "./bin/${python_prefix}-post-install.sh" \
187158
--deb-no-default-config-files \
188159
--deb-systemd ./bin/systemd/alignak-arbiter@.service \
189160
--deb-systemd ./bin/systemd/alignak-broker@.service \
@@ -211,12 +182,10 @@ elif [ "${output_type}" = "rpm" ]; then
211182
--python-package-name-prefix "${python_prefix}" \
212183
--python-scripts-executable "/usr/bin/env python" \
213184
--python-install-lib "/usr/lib/python${python_version}/site-packages" \
214-
--python-bin 'python' \
215-
--python-pip 'pip' \
216185
--python-install-data '/usr/local' \
217186
--python-install-bin '/usr/local/bin' \
218187
--no-python-dependencies \
219-
--after-install './bin/post-install.sh' \
188+
--after-install "./bin/${python_prefix}-post-install.sh" \
220189
./setup.py
221190
else
222191
fpm \
@@ -233,10 +202,10 @@ else
233202
--vendor "${pkg_team}" \
234203
--maintainer "${pkg_team}" \
235204
--python-scripts-executable "/usr/bin/env python" \
236-
--python-install-lib "/usr/lib/python${python_version}/site-packages" \
205+
--python-install-lib "/usr/local/lib/python${python_version}/site-packages" \
237206
--python-install-data '/usr/local' \
238207
--python-install-bin '/usr/local/bin' \
239208
--no-python-dependencies \
240-
--after-install './bin/post-install.sh' \
209+
--after-install "./bin/${python_prefix}-post-install.sh" \
241210
./setup.py
242211
fi

0 commit comments

Comments
 (0)