From 5c17f14bba4e7dd5bdea822171507a86be1aa3d9 Mon Sep 17 00:00:00 2001
From: Alex Biddulph <abiddulph@4tel.com.au>
Date: Thu, 19 Oct 2023 14:22:13 +1100
Subject: [PATCH] Remove unecessary scripts

---
 avr/platform.txt                           | 16 ++++++----------
 avr/scripts/create_disassembler_listing.sh |  8 --------
 avr/scripts/delete_merged_output.sh        |  4 ----
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100755 avr/scripts/create_disassembler_listing.sh
 delete mode 100755 avr/scripts/delete_merged_output.sh

diff --git a/avr/platform.txt b/avr/platform.txt
index 13c193ca2..92499a81b 100644
--- a/avr/platform.txt
+++ b/avr/platform.txt
@@ -77,10 +77,8 @@ recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf
 ## Save disassembler listing
 # Dummy initial `echo.` command prevents unwanted stripping of quotes by `cmd /C` which would cause the command to fail for paths with spaces
 recipe.hooks.objcopy.postobjcopy.1.pattern.windows=cmd /C echo. && "{compiler.path}{compiler.objdump.cmd}" {compiler.objdump.flags} "{build.path}/{build.project_name}.elf" > "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst"
-recipe.hooks.objcopy.postobjcopy.1.pattern.linux=chmod +x "{runtime.platform.path}/scripts/create_disassembler_listing.sh"
-recipe.hooks.objcopy.postobjcopy.1.pattern.macosx=chmod +x "{runtime.platform.path}/scripts/create_disassembler_listing.sh"
-recipe.hooks.objcopy.postobjcopy.2.pattern.linux="{runtime.platform.path}/scripts/create_disassembler_listing.sh" "{compiler.path}{compiler.objdump.cmd}" "{compiler.objdump.flags}" "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst"
-recipe.hooks.objcopy.postobjcopy.2.pattern.macosx="{runtime.platform.path}/scripts/create_disassembler_listing.sh" "{compiler.path}{compiler.objdump.cmd}" "{compiler.objdump.flags}" "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst"
+recipe.hooks.objcopy.postobjcopy.1.pattern.linux="/bin/bash" "-c" "{compiler.path}{compiler.objdump.cmd} {compiler.objdump.flags} {build.path}/{build.project_name}.elf" > "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst"
+recipe.hooks.objcopy.postobjcopy.1.pattern.macosx="/bin/bash" "-c" "{compiler.path}{compiler.objdump.cmd} {compiler.objdump.flags} {build.path}/{build.project_name}.elf" > "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst"
 
 ## Save compiled hex
 recipe.output.tmp_file={build.project_name}.hex
@@ -89,12 +87,10 @@ recipe.output.save_file={build.project_name}_{build.mcu}_{build.f_cpu}.hex
 ## Save hex
 recipe.hooks.savehex.presavehex.1.pattern.windows="{runtime.platform.path}/scripts/delete_merged_output.bat" {build.export_merged_output} "{build.path}\{build.project_name}.with_bootloader.hex"
 recipe.hooks.savehex.presavehex.2.pattern.windows=cmd /C copy "{build.path}\{build.project_name}_{build.mcu}_{build.f_cpu}.lst" "{sketch_path}"
-recipe.hooks.savehex.presavehex.1.pattern.linux=chmod +x "{runtime.platform.path}/scripts/delete_merged_output.sh"
-recipe.hooks.savehex.presavehex.2.pattern.linux="{runtime.platform.path}/scripts/delete_merged_output.sh" {build.export_merged_output} "{build.path}/{build.project_name}.with_bootloader.hex"
-recipe.hooks.savehex.presavehex.3.pattern.linux=cp "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst" "{sketch_path}"
-recipe.hooks.savehex.presavehex.1.pattern.macosx=chmod +x "{runtime.platform.path}/scripts/delete_merged_output.sh"
-recipe.hooks.savehex.presavehex.2.pattern.macosx="{runtime.platform.path}/scripts/delete_merged_output.sh" {build.export_merged_output} "{build.path}/{build.project_name}.with_bootloader.hex"
-recipe.hooks.savehex.presavehex.3.pattern.macosx=cp "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst" "{sketch_path}"
+recipe.hooks.savehex.presavehex.1.pattern.linux="/bin/bash" "-c" 'if [ "{build.export_merged_output}" == "false" ]; then rm "{build.path}/{build.project_name}.with_bootloader.hex"; fi'
+recipe.hooks.savehex.presavehex.2.pattern.linux=cp "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst" "{sketch_path}"
+recipe.hooks.savehex.presavehex.1.pattern.macosx="/bin/bash" "-c" 'if [ "{build.export_merged_output}" == "false" ]; then rm "{build.path}/{build.project_name}.with_bootloader.hex"; fi'
+recipe.hooks.savehex.presavehex.2.pattern.macosx=cp "{build.path}/{build.project_name}_{build.mcu}_{build.f_cpu}.lst" "{sketch_path}"
 
 
 ## Compute size
diff --git a/avr/scripts/create_disassembler_listing.sh b/avr/scripts/create_disassembler_listing.sh
deleted file mode 100755
index 84e8b1921..000000000
--- a/avr/scripts/create_disassembler_listing.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-objdumpCommand="$1"
-options="$2"
-objfile="$3"
-outputFile="$4"
-
-"$objdumpCommand" $options "$objfile" > "$outputFile"
diff --git a/avr/scripts/delete_merged_output.sh b/avr/scripts/delete_merged_output.sh
deleted file mode 100755
index c2cc49338..000000000
--- a/avr/scripts/delete_merged_output.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-if [ "$1" == "false" ]; then
-  rm "$2"
-fi