Adjust generation of final zip file for manufacturing

Reduce lint and improve reproducibility
manufacturing.sh now (maybe) passes shellcheck
python code is flake8-compliant (with new tox.ini file)
KiCad version ID in gbr, drl, csv output files is coerced to "5.1.x" if it starts in that form with 10 <= x <= 99.
Tested that contents of the zip file match on two systems:
  5.1.10 on Debian Buster, 5.1.12 on Debian Bullseye

Author: ldoolitt

design/scripts/attrib_lint.py

@@ -96,8 +96,8 @@ def process_sch(f):
             value = None
         elif in_comp:
             if row[0] == "L":
-                    lib_ref = row[1]
-                    lib_ref_attrs = check_lib_ref(lib_ref)
+                lib_ref = row[1]
+                lib_ref_attrs = check_lib_ref(lib_ref)
             elif row[0] == "F" and len(row) > 2:
                 rnum = int(row[1])
                 if rnum == 0:

design/scripts/kicad_exporter.py

@@ -219,7 +219,7 @@ def export_pos(self, dnf_parts=[], skip_th=True, verbose=False):
 ## Unit = mm, Angle = deg.
 ## Side : All
 # Ref  Val  Package  PosX  PosY  Rot  Side
-'''.format(desc(), __file__))
+'''.format(desc(), basename(__file__)))
 
             for m in m_props:
                 f.write('''\

design/scripts/manufacturing.sh

@@ -39,16 +39,16 @@ if ! test -r $KB; then
 fi
 
 # Make sure we're running under bash so brace expansion works
-if ! test "`echo A{B,C}`" = "AB AC"; then
+if ! test "$(echo A{B,C})" = "AB AC"; then
   echo "Error, not running under bash"
   exit 1
 fi
 
 if git diff | grep -q .; then
   spec=xxxxxxxx
 else
-  spec=`git rev-parse --short=8 HEAD`
-  SOURCE_DATE_EPOCH=`git log -1 --pretty=%ct`
+  spec=$(git rev-parse --short=8 HEAD)
+  SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
   # see https://reproducible-builds.org/docs/source-date-epoch/
 fi
 zipfile=marble-${spec}-fab.zip
@@ -61,7 +61,7 @@ rm -f marble*.dat
 die=0
 for f in $A.{d356,xml}; do
   if ! test -r "$f"; then echo "missing: $f"; die=1;
-  elif ! test "$f" = "`find \"$f\" -newer $A.kicad_pcb`"; then echo "stale:   $f"; die=1; else
+  elif ! test "$f" = "$(find $f -newer $A.kicad_pcb)"; then echo "stale:   $f"; die=1; else
   echo "OK:      $f"; fi
 done
 if test $die = 1; then echo Aborting; exit 1; fi
@@ -74,7 +74,7 @@ python3 scripts/kicad_exporter.py --layers 10 $A.kicad_pcb PCB_layers
 die=0
 for f in PCB_layers/$A-all.pos PCB_layers/$A-{B_Cu,B_Mask,B_Paste,B_SilkS,Edge_Cuts,F_Cu,F_Mask,F_Paste,F_SilkS,In{1,2,3,4,5,6,7,8,9,10}_Cu}.gbr PCB_layers/$A-{,N}PTH.drl; do
   if ! test -r "$f"; then echo "missing: $f"; die=1;
-  elif ! test "$f" = "`find \"$f\" -newer $A.kicad_pcb`"; then echo "stale:   $f"; die=1; else
+  elif ! test "$f" = "$(find $f -newer $A.kicad_pcb)"; then echo "stale:   $f"; die=1; else
   echo "OK:      $f"; fi
 done
 if test $die = 1; then echo Aborting; exit 1; fi
@@ -90,7 +90,7 @@ bomfile=${A}_BOM.csv
 bomfile2=${A}_BOMa.csv
 echo "$bomfile"
 test -r "$bomfile"
-test "$bomfile" = "`find "$bomfile" -newer $A.xml`"
+test "$bomfile" = "$(find "$bomfile" -newer $A.xml)"
 echo generated files are OK
 echo starting post-processing
 
@@ -113,14 +113,30 @@ rm -rf fab
 mkdir fab
 cd PCB_layers
 for f in *.gbr; do
-  sed -e '/TF.CreationDate/d' -e '/Created by KiCad/s/ date .*/*/' < $f > ../fab/marble${f#$A}
+  sed \
+    -e '/TF.CreationDate/d' \
+    -e '/Created by KiCad/s/ date .*/*/' \
+    -e '/GenerationSoftware/s/Pcbnew,5\.1\.1.\*/Pcbnew,5.1.x\*/' \
+    -e '/Created by KiCad/s/(PCBNEW 5\.1\.1.)/PCBNEW 5.1.x)/' \
+    < "$f" > "../fab/marble${f#$A}"
 done
 for f in *.drl; do
-  sed -e '/TF.CreationDate/d' -e '/ DRILL file /s/ date .*//' < $f > ../fab/marble${f#$A}
+  sed \
+    -e '/TF.CreationDate/d' \
+    -e '/ DRILL file /s/ date .*//' \
+    -e '/GenerationSoftware/s/Pcbnew,5\.1\.1.$/Pcbnew,5.1.x/' \
+    -e '/DRILL file/s/{KiCad 5\.1\.1.}/{KiCad 5.1.x}/' \
+    < "$f" > "../fab/marble${f#$A}"
 done
 cd ..
-sed -e '/Module positions/s/ - created on .*/ ###/' -e '/Module positions/s/ for .*/ ###/' < marble-xy.pos > fab/marble-xy.pos
-sed -e '/^BoM Date:/d' < "$bomfile2" > fab/marble-bom.csv
+sed \
+  -e '/Module positions/s/ - created on .*/ ###/' \
+  -e '/Module positions/s/ for .*/ ###/' \
+  < marble-xy.pos > fab/marble-xy.pos
+sed \
+  -e '/^BoM Date:/d' \
+  -e '/KiCad Version/s/Eeschema 5\.1\.1.$/Eeschema 5.1.x/' \
+  < "$bomfile2" > fab/marble-bom.csv
 mv marble-stuff.log fab/
 cp $A.d356 fab/marble-ipc-d-356.txt
 cp marble-stack.txt fab/marble-stack.txt
@@ -129,23 +145,23 @@ cp scripts/testpoint_map.gvp fab/testpoint_map.gvp
 mv testpoint_map.gbr fab/testpoint_map.gbr
 
 # Fancy file integrity feature, presumably nobody besides Larry will care
-(cd fab && sha256sum * > marble-sha256.txt)
+(cd fab && sha256sum -- * > marble-sha256.txt)
 (cat ../docs/README_fab.txt; cd fab; sha256sum marble-sha256.txt) > fab/README_fab.txt
 
 # Create the final zip file
-rm -f $zipfile
+rm -f "$zipfile"
 if test -n "$SOURCE_DATE_EPOCH"; then
   echo "Forcing timestamp $SOURCE_DATE_EPOCH"
-  touch --date=@$SOURCE_DATE_EPOCH fab/*
-  zip --latest-time $zipfile fab/*
+  touch --date="@$SOURCE_DATE_EPOCH" fab/*
+  zip --latest-time "$zipfile" fab/*
 else
-  zip $zipfile fab/*
+  zip "$zipfile" fab/*
 fi
 
 if [ "$1" != "debug" ]; then  # clean-up step, can skip when debugging
   rm -f marble*.dat marble-xy.pos $A.d356 $A.xml "$bomfile" "${bomfile}.tmp" "$bomfile2"
   rm -rf PCB_layers fab
 fi
 # marble-${spec}-fab.zip is the only generated file that should remain
-ls -l $zipfile
+ls -l "$zipfile"
 echo DONE

design/scripts/tox.ini

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length=120