"rm -f" is a bit shorter :) Cheers, Henrik -- Sent from my phone 12. apr. 2016 16.57 skrev "Miika Turkia" <[email protected]>:
> Running subsurface/packaging/android/build.sh after deleting > subsurface-mobile-build-arm directory fails for me due to missing > ssrf-version.h file. Thus we should only delete it if it actually > exists. > > Signed-off-by: Miika Turkia <[email protected]> > --- > packaging/android/build.sh | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/packaging/android/build.sh b/packaging/android/build.sh > index 17ccb03..8ed7ad8 100644 > --- a/packaging/android/build.sh > +++ b/packaging/android/build.sh > @@ -356,7 +356,10 @@ sed -i -e "s/-lcrypto//g" > CMakeFiles/subsurface-mobile.dir/link.txt > > # set up the version number > > -rm ssrf-version.h > +if [ -f ssrf-version.h ] > +then > + rm ssrf-version.h > +fi > make version > SUBSURFACE_MOBILE_VERSION=$(grep MOBILE_VERSION_STRING ssrf-version.h | > awk '{ print $3 }' | tr -d \" ) > SUBSURFACE_MOBILE_VERSION="${SUBSURFACE_MOBILE_VERSION} ($(grep > CANONICAL_VERSION_STRING ssrf-version.h | awk '{ print $3 }' | tr -d \"))" > -- > 2.5.0 > > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface >
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
