aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@gmail.com>2016-09-19 17:34:35 +0000
committerEd Warnicke <hagbard@gmail.com>2016-10-04 22:18:24 +0000
commite7a79873d30d25da086e533d596754a6f2e21d27 (patch)
tree87a253ad4a0d974b7f0e26643fcc9c1fcc708749
parent440cde6899d2113c07d192b3490b546d8a62a5b9 (diff)
Only build packages, don't do a fresh make install afterward
Change-Id: I395ed0991ea1a432f2e4d1d75b6dde45197434f3 Signed-off-by: Ed Warnicke <hagbard@gmail.com> Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rwxr-xr-xnsh-plugin/build.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/nsh-plugin/build.sh b/nsh-plugin/build.sh
index 81e75b8..a737043 100755
--- a/nsh-plugin/build.sh
+++ b/nsh-plugin/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-
+set -xe -o pipefail
# Figure out what system we are running on
if [ -f /etc/lsb-release ];then
. /etc/lsb-release
@@ -33,8 +33,16 @@ autoreconf -i -f
cd build
../configure --prefix ${NSH_INSTALL_PREFIX}
if [ $DISTRIB_ID == "CentOS" ]; then
+ echo "Start building rpms"
make V=1 PATH=${PATH} pkg-rpm
+ echo "Finished building rpms"
elif [ $DISTRIB_ID == "Ubuntu" ]; then
+ echo "Start building debs"
make V=1 PATH=${PATH} pkg-deb
+ echo "Finished building debs"
+else
+ echo "Not packing. Start make install"
+ ${SUDOCMD-sudo} make PATH=${PATH} install
+ echo "Not packing. Finished make install"
fi
-${SUDOCMD-sudo} make PATH=${PATH} install
+