Update update-components.sh

Author: Jason2866

tools/update-components.sh

@@ -2,7 +2,9 @@
 
 source ./tools/config.sh
 
-CAMERA_REPO_URL="https://github.com/tasmota/esp32-camera.git"
+CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
+DL_REPO_URL="https://github.com/espressif/esp-dl.git"
+SR_REPO_URL="https://github.com/espressif/esp-sr.git"
 DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
 LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
 TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
@@ -16,19 +18,31 @@ if [ ! -d "$AR_COMPS/arduino" ]; then
 fi
 
 if [ -z $AR_BRANCH ]; then
-	has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "idf-$IDF_BRANCH"`
-	if [ "$has_ar_branch" == "1" ]; then
-		export AR_BRANCH="idf-$IDF_BRANCH"
+	if [ -z $GITHUB_HEAD_REF ]; then
+		current_branch=`git branch --show-current`
 	else
-		has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"`
+		current_branch="$GITHUB_HEAD_REF"
+	fi
+	echo "Current Branch: $current_branch"
+	if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
+		export AR_BRANCH="$current_branch"
+	else
+		has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "idf-$IDF_BRANCH"`
 		if [ "$has_ar_branch" == "1" ]; then
-			export AR_BRANCH="$AR_PR_TARGET_BRANCH"
+			export AR_BRANCH="idf-$IDF_BRANCH"
+		else
+			has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"`
+			if [ "$has_ar_branch" == "1" ]; then
+				export AR_BRANCH="$AR_PR_TARGET_BRANCH"
+			fi
 		fi
 	fi
 fi
 
 if [ "$AR_BRANCH" ]; then
-	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH"
+	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
+	git -C "$AR_COMPS/arduino" fetch && \
+	git -C "$AR_COMPS/arduino" pull --ff-only
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
@@ -48,6 +62,30 @@ if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
+#
+# CLONE/UPDATE ESP-DL
+#
+
+#if [ ! -d "$AR_COMPS/esp-dl" ]; then
+#	git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
+#else
+#	git -C "$AR_COMPS/esp-dl" fetch && \
+#	git -C "$AR_COMPS/esp-dl" pull --ff-only
+#fi
+#if [ $? -ne 0 ]; then exit 1; fi
+
+#
+# CLONE/UPDATE ESP-SR
+#
+
+#if [ ! -d "$AR_COMPS/esp-sr" ]; then
+#	git clone $SR_REPO_URL "$AR_COMPS/esp-sr"
+#else
+#	git -C "$AR_COMPS/esp-sr" fetch && \
+#	git -C "$AR_COMPS/esp-sr" pull --ff-only
+#fi
+#if [ $? -ne 0 ]; then exit 1; fi
+
 #
 # CLONE/UPDATE ESP-LITTLEFS
 #
@@ -68,10 +106,10 @@ if [ $? -ne 0 ]; then exit 1; fi
 
 if [ ! -d "$AR_COMPS/esp-dsp" ]; then
 	git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp"
-	cml=`cat "$AR_COMPS/esp-dsp/CMakeLists.txt"`
-	echo "if(IDF_TARGET STREQUAL \"esp32\" OR IDF_TARGET STREQUAL \"esp32s2\" OR IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-dsp/CMakeLists.txt"
-	echo "$cml" >> "$AR_COMPS/esp-dsp/CMakeLists.txt"
-	echo "endif()" >> "$AR_COMPS/esp-dsp/CMakeLists.txt"
+	# cml=`cat "$AR_COMPS/esp-dsp/CMakeLists.txt"`
+	# echo "if(IDF_TARGET STREQUAL \"esp32\" OR IDF_TARGET STREQUAL \"esp32s2\" OR IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-dsp/CMakeLists.txt"
+	# echo "$cml" >> "$AR_COMPS/esp-dsp/CMakeLists.txt"
+	# echo "endif()" >> "$AR_COMPS/esp-dsp/CMakeLists.txt"
 else
 	git -C "$AR_COMPS/esp-dsp" fetch && \
 	git -C "$AR_COMPS/esp-dsp" pull --ff-only