summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@gmail.com>2016-09-19 17:34:35 +0000
committerEd Warnicke <hagbard@gmail.com>2016-09-19 17:34:35 +0000
commitb4a4277a118696634eb75b4f5476b97f4fbbd721 (patch)
tree7996e9f8dfc4cabd0305dc40203a6c35d08833c2
parent864fa77d3738db12b0d43b53ad2f3761db8a69dd (diff)
Only build packages, don't do a fresh make install afterward
Change-Id: I5078dc886a50b34e1fc0d9d894582ac82598a782 Signed-off-by: Ed Warnicke <hagbard@gmail.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
+