From 3c3501089305fea33bff47a29fc5c2aefff355bd Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Sun, 28 Aug 2022 16:44:18 +0100
Subject: [PATCH] f4pga/wrappers/sh: use F4PGA_SHARE_DIR in python, instead of
 shell

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 f4pga/wrappers/sh/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/f4pga/wrappers/sh/__init__.py b/f4pga/wrappers/sh/__init__.py
index ed7d2f2..4abb4d9 100644
--- a/f4pga/wrappers/sh/__init__.py
+++ b/f4pga/wrappers/sh/__init__.py
@@ -664,8 +664,8 @@ DESIGN=${EBLIF/.eblif/}
 [ ! -z "${PCF_PATH}" ] && PCF_ARGS="--pcf-constraints ${PCF_PATH}" || PCF_ARGS=
 """
         + f"""
-PYTHONPATH=$F4PGA_SHARE_DIR/scripts:$PYTHONPATH \
-  '{python3}' "$F4PGA_SHARE_DIR"/scripts/repacker/repack.py \
+PYTHONPATH='{F4PGA_SHARE_DIR}/scripts':$PYTHONPATH \
+  '{python3}' '{F4PGA_SHARE_DIR}/scripts/repacker/repack.py' \
     --vpr-arch ${{ARCH_DEF}} \
     --repacking-rules ${{ARCH_DIR}}/${{DEVICE_NAME}}.repacking_rules.json \
     $JSON_ARGS \
@@ -719,7 +719,7 @@ if [ -z $BIT ]; then echo "Please provide an output bistream file name"; exit 1;
         + f"""
 if [[ "$DEVICE" =~ ^(qlf_k4n8.*)$ ]]; then
   '{which('qlf_fasm')}' \
-    --db-root "${{F4PGA_SHARE_DIR}}/fasm_database/${{DEVICE}}" \
+    --db-root '{F4PGA_SHARE_DIR}/fasm_database/'"${{DEVICE}}" \
     --format "$BIT_FORMAT" \
     --assemble \
     "$FASM" \
@@ -752,13 +752,13 @@ if [[ '{device}' =~ ^(qlf_k4n8_qlf_k4n8)$ ]];then
 else
   DEVICE_1={device}
 fi
+ARCH_DIR='{F4PGA_SHARE_DIR}/arch/'"${{DEVICE_1}}_${{DEVICE_1}}"
 """
         + """
-ARCH_DIR="${F4PGA_SHARE_DIR}/arch/${DEVICE_1}_${DEVICE_1}"
 PINMAP_XML=${ARCH_DIR}/${PINMAPXML}
 """
         + f"""
-'{python3}' "$F4PGA_SHARE_DIR"/scripts/create_lib.py \
+'{python3}' '{F4PGA_SHARE_DIR}/scripts/create_lib.py' \
   -n "${{DEV}}_0P72_SSM40" \
   -m fpga_top \
   -c '{part}' \
@@ -814,8 +814,8 @@ if [ -z "{PCF}" ]; then PCF_ARGS=""; else PCF_ARGS="--input-pcf ${PCF}"; fi
 echo "Running fasm2bels"
 """
         + f"""
-'{python3}' "${{F4PGA_SHARE_DIR}}"/scripts/fasm2bels.py "${{BIT}}" \
-  --phy-db "${{F4PGA_SHARE_DIR}}/arch/${{DEVICE}}_wlcsp/db_phy.pickle" \
+'{python3}' '{F4PGA_SHARE_DIR}/scripts/fasm2bels.py' "${{BIT}}" \
+  --phy-db '{F4PGA_SHARE_DIR}/arch/'"${{DEVICE}}_wlcsp/db_phy.pickle" \
   --device-name "${{DEVICE/ql-/}}" \
   --package-name "$PART" \
   --input-type bitstream \