From 48e6c62d6f6da4f1d6a0925571560e628a8edc58 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Sat, 17 Aug 2019 21:57:11 +0200 Subject: [PATCH] special characters should now work in interfaces&libraries path --- interfaces-and-libraries.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/interfaces-and-libraries.sh b/interfaces-and-libraries.sh index efe2a372a4..9af8f7fdc7 100755 --- a/interfaces-and-libraries.sh +++ b/interfaces-and-libraries.sh @@ -16,18 +16,6 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -function verifyInterfaceDirNames() -{ - printf "Searching for special characters in subdirs of $INTERFACES_DIR" - local found=`find "$INTERFACES_DIR" -type d -name "*" -print ` - if [ "`echo $found | grep \&`" ]; then - echo "\n$found Contained special character &" - return 1 # failure - else - return 0 # success - fi -} - function locateInterfaceThing() { local varname=$1 @@ -66,15 +54,6 @@ function locateAndCheckInterfacesAndLibraries() { echo "Looking for various files in $INTERFACES_DIR/..." - if verifyInterfaceDirNames; then - echo "Directory name looks clean" - else - echo "Directory name contained special character & that would break build" - echo "Please install the Interfaces and Libraries files in a path under" - echo "$INTERFACES_DIR that does not contain the & character" - exit 1 - fi - if locateInterfaceThing CONDITIONALMACROS_H ConditionalMacros.h; then CINCLUDES=`dirname "$CONDITIONALMACROS_H"` else @@ -142,7 +121,7 @@ function locateAndCheckInterfacesAndLibraries() if locateInterfaceThing CARBONLIB CarbonLib; then carbondir=`dirname "$CARBONLIB"` if [ "$carbondir" != "$SHAREDLIBRARIES" ]; then - echo "Carbon.h found, but not in the same directory as InterfaceLib." + echo "CarbonLib found, but not in the same directory as InterfaceLib." echo "This is confusing." echo explainInterfaces