Update the Text Variable Preflight

kibot/scripts/bootstrap.sh

@@ -10,8 +10,8 @@ git checkout -qb dev
 echo "Created Development Branch"
 
 # Add the Asymworks KiCad Library
-git remote --no-verbose add -f asymworks-kicad-lib https://git.asymworks.com/asymworks/kicad-library >/dev/null 2>&1
-# git subtree -q add --prefix lib/asymworks asymworks-kicad-lib main --squash -m "[bootstrap] Add subtree 'Asymworks/KiCad-Library' at 'lib/asymworks'"
+git remote --no-verbose add -f asymworks-kicad-lib https://git.asymworks.com/asymworks/kicad-library >/dev/null
+git subtree -q add --prefix lib/asymworks asymworks-kicad-lib main --squash -m "[bootstrap] Add subtree 'Asymworks/KiCad-Library' at 'lib/asymworks'"
 echo "Added Asymworks KiCad Library"
 
 # Initialize the Project Metadata
@@ -44,7 +44,7 @@ echo "Renamed project to \"${ASSY_NUMBER}.kicad_pro\""
 # Push the Develpment Branch to Gitea
 git add --no-verbose project.json
 git commit -aq -m 'Initialize Project'
-git push -qu origin dev
+git push --no-verbose -qu origin dev >/dev/null
 echo "Initialized and Committed Project"
 
 # Bootstrap Complete

kibot/yaml/kibot_pre_set_text_variables.yaml

@@ -22,45 +22,21 @@ preflight:
     - variable: 'GIT_HASH'
       command: 'git log -1 --format="%h"'
     - variable: 'GIT_URL'
-      text: '@GIT_URL@'
+      command: 'git remote get-url origin | sed -e s"/\\.git$//g"'
 
     # Metadata
-    - variable: 'PROJECT_CODE'
-      text: '@PROJECT_CODE@'
-    - variable: 'ASSEMBLY_NUMBER'
-      text: '@ASSEMBLY_NUMBER@'
-    - variable: 'ASSEMBLY_NAME'
-      text: '@ASSEMBLY_NAME@'
-    - variable: 'ASSEMBLY_SCALE'
-      text: '@ASSEMBLY_SCALING@'
-    - variable: 'DWG_NUMBER_PCB'
-      text: '@DWG_NUMBER_PCB@'
-    - variable: 'DWG_NUMBER_SCH'
-      text: '@DWG_NUMBER_SCH@'
-    - variable: 'DWG_TITLE_PCB'
-      text: '@DWG_TITLE_PCB@'
-    - variable: 'DWG_TITLE_SCH'
-      text: '@DWG_TITLE_SCH@'
-    - variable: 'DWG_TITLE_ASSY'
-      text: '@DWG_TITLE_ASSY@'
-    - variable: 'COMPANY'
-      text: '@COMPANY@'
-    - variable: 'DESIGNER'
-      text: '@DESIGNER@'
     - variable: 'VARIANT'
       text: '%V'
 
-    # Schematic notes
+    # Notes
     - variable: 'SCHEMATIC_NOTES'
       expand_in_command: true
       command: '[ -f "@SCHEMATIC_DIR@/%f-schematic_notes%v.txt" ] && cat "@SCHEMATIC_DIR@/%f-schematic_notes%v.txt" || echo ""'
 
-    # Fabrication notes
     - variable: 'FABRICATION_NOTES'
       expand_in_command: true
       command: '[ -f "@FABRICATION_DIR@/%f-fabrication_notes%v.txt" ] && cat "@FABRICATION_DIR@/%f-fabrication_notes%v.txt" || echo ""'
 
-    # Assembly notes
     - variable: 'ASSEMBLY_NOTES'
       expand_in_command: true
       command: '[ -f "@ASSEMBLY_DIR@/%f-assembly_notes%v.txt" ] && cat "@ASSEMBLY_DIR@/%f-assembly_notes%v.txt" || echo ""'
@@ -109,24 +85,13 @@ preflight:
 
 ...
 definitions:
-  PROJECT_CODE: ''
-  ASSEMBLY_NUMBER: ''
-  ASSEMBLY_NAME: ''
-  ASSEMBLY_SCALING: ''
-  DWG_NUMBER_SCH: ''
-  DWG_TITLE_SCH: ''
-  DWG_NUMBER_PCB: ''
-  DWG_TITLE_PCB: ''
-  DWG_TITLE_ASSY: ''
-  COMPANY: ''
-  DESIGNER: ''
   REVISION: ''
   RELEASE_STATE: ''
   RELEASE_DATE: ''
-  GIT_URL: ''
 
   SHEET_NAME_VAR: SHEET_NAME_
   SCRIPTS_DIR: kibot/scripts
   FABRICATION_DIR: mfg/fab
   ASSEMBLY_DIR: mfg/assembly
   GET_SHEET_CMD: python3 @SCRIPTS_DIR@/get_sheet_title.py -f "${KIBOT_SCH_NAME%.kicad_sch}.xml" --dots-number 38 -p
+  GET_GITURL_CMD: git remote get-url origin | sed -e s'/\.git$//g'