From c43e99823312c0263c42774f6eb0124f60012618 Mon Sep 17 00:00:00 2001 From: Stefan Wildemann Date: Tue, 5 Jun 2018 00:05:12 +0200 Subject: Revert #612 for sailfish build script Whatever the 'enhancement' done in #612 should bring, it causes grep to complain for non existing file in Sailfish's MER SDK. Most probably because the escaping of the parenthesis was wrongly considered. Never mind - revert. --- contrib/sailfish/build_on_sailfish_sdk.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/sailfish/build_on_sailfish_sdk.sh b/contrib/sailfish/build_on_sailfish_sdk.sh index a3d515ab0..634ab9c26 100755 --- a/contrib/sailfish/build_on_sailfish_sdk.sh +++ b/contrib/sailfish/build_on_sailfish_sdk.sh @@ -1,12 +1,16 @@ #! /bin/sh #run on the Sailfish OS sdk virtual machine. Check that rpmbuild directory exists. Remember to export VERSION_ID +# please don't mess around with those lines without testing, +# even if some fancy tool tells you to do so to save some pipes. +# -metalstrolch- + if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi #arm devices -sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper in `grep navit-sailfish.spec "^BuildRequires: " | sed -e "s/BuildRequires: //"` +sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper in `cat navit-sailfish.spec | grep "^BuildRequires: " | sed -e "s/BuildRequires: //"` sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec #intel devices -sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper in `grep navit-sailfish.spec "^BuildRequires: " | sed -e "s/BuildRequires: //"` +sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper in `cat navit-sailfish.spec | grep "^BuildRequires: " | sed -e "s/BuildRequires: //"` sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec -- cgit v1.2.1