From f572b3824680c0e4cf0f4dbfd5af8f94490c8736 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Tue, 2 Jun 2020 08:36:13 -0500 Subject: [PATCH] Remove bashisms from scripts/build-VB.NET.sh --- scripts/build-VB.NET.sh | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/scripts/build-VB.NET.sh b/scripts/build-VB.NET.sh index 4094384bb..09c75fbd8 100644 --- a/scripts/build-VB.NET.sh +++ b/scripts/build-VB.NET.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # A script to build a set of VB.NET 2002 Framework 1.1 binary DLLs from a # Hamlib tarball. This script assumes that the Hamlib tarball has been @@ -24,18 +24,25 @@ EX_NOINPUT=66 # Pass name of Hamlib archive extracted in $BUILD_DIR if [ $# -ne 1 ]; then - echo -e "\nUsage: $(basename $0) hamlib-version\n" - echo -e "See README.build-VB.NET for more information.\n" - exit $EX_USAGE + echo + echo "Usage: $(basename $0) hamlib-version" + echo "See README.build-VB.NET for more information." + + exit $EX_USAGE fi # Make sure the Hamlib archive is where we expect if [ -d ${BUILD_DIR}/$1 ]; then - echo -e "\nBuilding VB.NET binaries in ${BUILD_DIR}/$1\n\n" - cd ${BUILD_DIR}/$1 + echo + echo "Building VB.NET binaries in ${BUILD_DIR}/$1" + echo + + cd ${BUILD_DIR}/$1 else - echo -e "\nBuild directory, ${BUILD_DIR}/$1 not found!\nCheck path for $1 or correct the version number.\n" - exit $EX_NOINPUT + echo "Build directory, ${BUILD_DIR}/$1 not found!" + echo "Check path for $1 or correct the version number." + + exit $EX_NOINPUT fi # FIXME: Determine RELEASE only from AC_INIT line to avoid any other similar @@ -189,7 +196,9 @@ cp -a src/libhamlib.def ${ZIP_DIR}/lib/msvc/libhamlib-2.def; todos ${ZIP_DIR}/li cp -a ${INST_DIR}/include/hamlib ${ZIP_DIR}/include/.; todos ${ZIP_DIR}/include/hamlib/*.h # C++ binding is useless on win32 because of ABI -rm ${ZIP_DIR}/include/hamlib/{rig,rot}class.h +for f in *class.h ; do \ + rm ${ZIP_DIR}/include/hamlib/${f} +done for f in AUTHORS ChangeLog COPYING COPYING.LIB LICENSE README README.betatester README.VB.NET-bin THANKS ; do \ cp -a ${f} ${ZIP_DIR}/${f}.txt ; todos ${ZIP_DIR}/${f}.txt ; done