Fix download URL and json merger

Author: me-no-dev

Diff for: tools/add_sdk_json.py

@@ -39,7 +39,6 @@
     print('Tool Size     : {0}.'.format(args.tool_size))
     print('Tool SHA256   : {0}.'.format(args.tool_sha))
 
-    idf_path = args.idf_path;
     arduino_json = args.arduino_json;
     tool_name = args.tool_name;
     tool_version = args.tool_version;

Diff for: tools/push-to-arduino.sh

@@ -108,12 +108,12 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 			exit 1
 		fi
 		IDF_LIBS_COMMIT=`git rev-parse --verify HEAD`
-		IDF_LIBS_DL_URL="https://github.com/espressif/esp32-arduino-libs/archive/$IDF_LIBS_COMMIT.zip"
+		IDF_LIBS_DL_URL="https://codeload.github.com/espressif/esp32-arduino-libs/zip/$IDF_LIBS_COMMIT"
 		# ToDo: this URL needs to get into Arduino's package.json
 
 		# Download the file
 		filename="esp32-arduino-libs-$IDF_LIBS_COMMIT.zip"
-		curl -s -O "$IDF_LIBS_DL_URL"
+		curl -s -o "$filename" "$IDF_LIBS_DL_URL"
 
 		# Check if the download was successful
 		if [ $? -ne 0 ]; then
@@ -150,10 +150,6 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 	fi
 fi
 
-# https://github.com/espressif/esp32-arduino-libs/archive/refs/heads/[branch].zip
-# https://github.com/espressif/esp32-arduino-libs/archive/refs/tags/[tag].zip
-# https://github.com/espressif/esp32-arduino-libs/archive/[commit_hash].zip
-
 if [ $AR_HAS_COMMIT == "0" ]; then
 	cd "$AR_ROOT"
 	# create or checkout the branch