From 8f99c7529f3453ded828f22c1e47a5302ec3f7c9 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 24 Oct 2023 10:01:00 +1000
Subject: [PATCH] Copy template sch file to panelized folder, instead of
 creating blank file

---
 kibot-ci.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/kibot-ci.yml b/kibot-ci.yml
index 5197504..3415dc4 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -71,18 +71,19 @@ image:
     - 'SEARCH="_panel.json"'
     - !reference [.commands, get_dirs]  
     - |
+          cd $CI_PROJECT_DIR
           for d in $DIRS
             do
               echo $d
-              cd $d
-              JSON=$(find *_panel.json)
-              NAME=$(echo "${JSON%.json}")
-              PCB=$(find *.kicad_pcb)
-              mkdir $CI_PROJECT_DIR/$NAME
-              kikit panelize -p $JSON $PCB $CI_PROJECT_DIR/$NAME/$NAME.kicad_pcb
-              touch $CI_PROJECT_DIR/$NAME/$NAME.kicad_sch
-              cp fp-lib-table $CI_PROJECT_DIR/$NAME/
-              python3 $CI_PROJECT_DIR/.gitlab/.scripts/post_panel.py $CI_PROJECT_DIR/$NAME/$NAME.kicad_pro $PCB
+              JSON=$(find $d/*_panel.json)
+              FILE=$(basename "${JSON}")
+              NAME=$(echo "${FILE%.json}")
+              PCB=$(find $d/*.kicad_pcb)
+              mkdir $NAME
+              kikit panelize -p $JSON $PCB $NAME/$NAME.kicad_pcb
+              cp .gitlab/micromelon_default/micromelon_default.kicad_sch $NAME/$NAME.kicad_sch
+              cp $d/fp-lib-table $NAME/
+              python3 .gitlab/.scripts/post_panel.py $NAME/$NAME.kicad_pro $PCB
             done
     - cd $CI_PROJECT_DIR