0001-fix-path.patch (3435B)
1 diff --git i/create_omtb_garmin_img.sh w/create_omtb_garmin_img.sh 2 index 03a0ae6..143260d 100755 3 --- i/create_omtb_garmin_img.sh 4 +++ w/create_omtb_garmin_img.sh 5 @@ -90,20 +90,20 @@ elif [[ -n ${OMTB_EXE:t} ]]; then 6 usage 7 fi 8 9 -GMT_CMD=( ${ARGS_A[-g]}(.N,@-.) ${^path}/gmt(.N,@-.) ) 10 +GMT_CMD=( ${ARGS_A[-g]}(.N,@-.) @gmaptool@/bin/gmt(.N,@-.) ) 11 GMT_CMD="${GMT_CMD[1]:a}" 12 # if wine exists, this expands into e.g. /usr/bin/wine, otherwhise it will remain as string =wine 13 # advantage over which wine is, that it outputs only one result, namely the executable that a call to wine on the CL would actually use 14 WINE_EXE==wine 15 16 # NB: If mkgmap is not found, we fall back to using gmt later. 17 -MKGMAP=( ${ARGS_A[-m]}(.N,@-.) /usr/share/mkgmap/mkgmap.jar(.N,@-.) /usr/local/share/mkgmap/mkgmap.jar(.N,@-.) /usr/share/java/mkgmap.jar(.N,@-.) /usr/share/java/mkgmap/mkgmap.jar(.N,@-.) ${^path}/mkgmap.jar(.N,@-.) ) 18 +MKGMAP=( ${ARGS_A[-m]}(.N,@-.) @mkgmap@/bin/mkgmap(.N,@-.) ) 19 MKGMAP="${MKGMAP[1]:a}" 20 21 -if ! [[ -x =7z ]]; then 22 - print "\nERROR: 7z is not installed, but needed to extract openmtbmap downloads !" > /dev/stderr 23 - exit 3 24 -fi 25 +#if ! [[ -x =7z ]]; then 26 +# print "\nERROR: 7z is not installed, but needed to extract openmtbmap downloads !" > /dev/stderr 27 +# exit 3 28 +#fi 29 30 31 DESC="${OMTBORVELO}_${OMTB_NAME}" 32 @@ -116,7 +116,7 @@ else 33 [[ -n $ARGS_A[-o] ]] && {print "\nWarning: -o given but ${ARGS_A[-o]} is not a directory.\n Using ${OMTB_EXE:A:h} instead..\n"} 34 fi 35 36 -if ! [[ ( -n $MKGMAP && -x =java ) || -x $WINE_EXE ]]; then 37 +if ! [[ ( -n $MKGMAP ) || -x $WINE_EXE ]]; then 38 print "\nERROR: either mkgmap (+java) or wine are required!" > /dev/stderr 39 exit 4 40 fi 41 @@ -151,7 +151,7 @@ fi 42 FIMG_a=(${TMPDIR}/6<->.img(N[1])) 43 if [[ -z $FIMG_a ]] ; then 44 print "Extracting $OMTB_EXE ..." 45 - 7z e -y -o$TMPDIR ${OMTB_EXE} &>/dev/null || exit 1 46 + @p7zip@/bin/7z e -y -o$TMPDIR ${OMTB_EXE} &>/dev/null || exit 1 47 #Check if extraction files are there 48 FIMG_a=(${TMPDIR}/6<->.img(N[1])) 49 [[ -z $FIMG_a ]] && {print "\nERROR: Could not find 6*.img file after extracting $OMTB_EXE" >/dev/stderr ; exit 1} 50 @@ -192,9 +192,9 @@ if [[ -n $MKGMAP ]]; then 51 print "Using mkgmap, building address search index..." 52 #java -Xmx1000M -jar mkgmap.jar --family-id=$FID --index --description="$DESC" --series-name="$DESC" --family-name="$DESC" --show-profiles=1 --product-id=1 --gmapsupp 6*.img 7*.img 01002468.TYP 53 if [[ $(grep MemTotal: /proc/meminfo | awk '{print $2}') -gt $((1024*1024*3)) ]]; then 54 - java -Xmx3000M -jar "$MKGMAP" --family-id=$FID --index --description="$DESC" --series-name="$DESC" --family-name="$DESC" --show-profiles=1 --product-id=1 --gmapsupp [67]*.img 01002468.TYP || exit 7 55 + $MKGMAP -Xmx3000M --family-id=$FID --index --description="$DESC" --series-name="$DESC" --family-name="$DESC" --show-profiles=1 --product-id=1 --gmapsupp [67]*.img 01002468.TYP || exit 7 56 else 57 - java -Xmx1000M -jar "$MKGMAP" --family-id=$FID --index --description="$DESC" --series-name="$DESC" --family-name="$DESC" --show-profiles=1 --product-id=1 --gmapsupp [67]*.img 01002468.TYP || exit 7 58 + $MKGMAP -Xmx1000M --family-id=$FID --index --description="$DESC" --series-name="$DESC" --family-name="$DESC" --show-profiles=1 --product-id=1 --gmapsupp [67]*.img 01002468.TYP || exit 7 59 fi 60 mv (#i)gmapsupp.img "${DSTFILENAME}" || exit 7 61 else