From 8a5db23271c1100c0f92c3fb4ed6e15bcc074558 Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <38422348+umarcor@users.noreply.github.com>
Date: Sun, 14 Aug 2022 14:00:40 +0200
Subject: [PATCH] f4pga/wrappers/sh/xc7/vpr_common: use '--' to separate
 additional VPR options (#614)

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh | 65 ++++++++---------------
 1 file changed, 21 insertions(+), 44 deletions(-)

diff --git a/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh b/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh
index a3801ca..cf40f84 100755
--- a/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh
+++ b/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh
@@ -50,54 +50,31 @@ fi
 
 function parse_args {
 
-     OPTS=d:e:p:n:P:s:a:
-     LONGOPTS=device:,eblif:,pcf:,net:,part:,sdc:,additional_vpr_options:
+     eval set -- "$(
+       getopt \
+         --options=d:e:p:n:P:s: \
+         --longoptions=device:,eblif:,pcf:,net:,part:,sdc: \
+         --name $0 -- "$@"
+     )"
 
-     PARSED_OPTS=`getopt --options=${OPTS} --longoptions=${LONGOPTS} --name $0 -- "$@"`
-     eval set -- "${PARSED_OPTS}"
-
-     DEVICE=""
-     DEVICE_NAME=""
-     PART=""
-     EBLIF=""
-     PCF=""
-     NET=""
-     SDC=""
-     ADDITIONAL_VPR_OPTIONS=""
+     DEVICE=''
+     DEVICE_NAME=''
+     PART=''
+     EBLIF=''
+     PCF=''
+     NET=''
+     SDC=''
+     ADDITIONAL_VPR_OPTIONS=''
 
      while true; do
           case "$1" in
-               -d|--device)
-                    DEVICE=$2
-                    shift 2
-                    ;;
-               -e|--eblif)
-                    EBLIF=$2
-                    shift 2
-                    ;;
-               -p|--pcf)
-                    PCF=$2
-                    shift 2
-                    ;;
-               -n|--net)
-                    NET=$2
-                    shift 2
-                    ;;
-               -P|--part)
-                    PART=$2
-                    shift 2
-                    ;;
-               -s|--sdc)
-                    SDC=$2
-                    shift 2
-                    ;;
-               -a|--additional_vpr_options)
-                    ADDITIONAL_VPR_OPTIONS="$2"
-                    shift 2
-		    ;;
-               --)
-                    break
-                    ;;
+               -d|--device) DEVICE=$2; shift 2 ;;
+               -e|--eblif)  EBLIF=$2;  shift 2 ;;
+               -p|--pcf)    PCF=$2;    shift 2 ;;
+               -n|--net)    NET=$2;    shift 2 ;;
+               -P|--part)   PART=$2;   shift 2 ;;
+               -s|--sdc)    SDC=$2;    shift 2 ;;
+               --) shift; ADDITIONAL_VPR_OPTIONS="$@"; break ;;
           esac
      done