RetroDriven vor 6 Jahren
Ursprung
Commit
da0043c744
1 geänderte Dateien mit 22 neuen und 17 gelöschten Zeilen
  1. 22 17
      Scripts/Updater_RetroDriven.sh

+ 22 - 17
Scripts/Updater_RetroDriven.sh

@@ -66,13 +66,13 @@ REBOOT_PAUSE=0
 TEMP_PATH="/tmp"
 TO_BE_DELETED_EXTENSION="to_be_deleted"
 
-sleep 3
 echo
 echo "RetroDriven.com - Launching Soon!"
 echo
-echo "I have decided to remove the Cores from GitHub - This will be working again soon with the Cores hosted elsewhere =)" 
+sleep 3
+echo "RetroDriven Core Updater - A Festivus for the rest of Us!" 
 echo
-sleep 10
+sleep 5
 
 #========= CODE STARTS HERE =========
 
@@ -99,7 +99,7 @@ then
 fi
 
 SSL_SECURITY_OPTION=""
-curl $CURL_RETRY -q https://github.com &>/dev/null
+curl $CURL_RETRY -q https://retrodriven.com &>/dev/null
 case $? in
 	0)
 		;;
@@ -145,7 +145,7 @@ then
 	mkdir -p "${NEW_CORE_CATEGORY_PATHS[@]}"
 fi
 
-CORE_URLS=$(curl $CURL_RETRY $SSL_SECURITY_OPTION -sLf "https://github.com/RetroDriven/Mister/wiki" | grep -io '\(https://github.com/RetroDriven/MiSTer_UnofficialCores/tree/master/Arcade_Cores/[a-zA-Z0-9./_-]*\)\|\(user-content-[a-z-]*\)')
+CORE_URLS=$(curl $CURL_RETRY $SSL_SECURITY_OPTION -sLf "https://github.com/RetroDriven/MiSTer_UnofficialCores/wiki" | grep -io '\(https://retrodriven.com/Mister_Cores/[a-zA-Z0-9./_-]*\)\|\(user-content-[a-z-]*\)')
 
 
 CORE_CATEGORY="-"
@@ -160,22 +160,20 @@ then
 fi
 
 function checkCoreURL {
-	
 	echo "Checking $(echo $CORE_URL | sed 's/.*\///g' | sed 's/_MiSTer//gI')"
 	[ "${SSH_CLIENT}" != "" ] && echo "URL: $CORE_URL"
-	if echo "$CORE_URL" | grep -q "SD-Installer"
-	then
-		RELEASES_URL="$CORE_URL"
-	else
-		RELEASES_URL=https://github.com$(curl $CURL_RETRY $SSL_SECURITY_OPTION -sLf "$CORE_URL" | grep -o '/RetroDriven/[a-zA-Z0-9./_-]*/tree/master/[a-zA-Z0-9./_-]*/releases' | head -n1)
-	fi
-
-	RELEASE_URLS=$(curl $CURL_RETRY $SSL_SECURITY_OPTION -sLf "$RELEASES_URL" | grep -o '/RetroDriven/[a-zA-Z0-9./_-]*_[0-9]\{8\}[a-zA-Z]\?\(\.rbf\|\.rar\)\?')
 
+	CORE_URL+="/releases/"
+	
+	RELEASE_URLS=$(curl $CURL_RETRY $SSL_SECURITY_OPTION -sLf "$CORE_URL" | grep -o '"[a-zA-Z0-9./_-]*_[0-9]\{8\}[a-zA-Z]\?\(\.rbf\|\.rar\)\?')
+	
 	MAX_VERSION=""
 	MAX_RELEASE_URL=""
 	GOOD_CORE_VERSION=""
 	for RELEASE_URL in $RELEASE_URLS; do
+
+		RELEASE_URL=$CORE_URL${RELEASE_URL#\"}
+	
 		if echo "$RELEASE_URL" | grep -q "SharpMZ"
 		then
 			RELEASE_URL=$(echo "$RELEASE_URL"  | grep '\.rbf$')
@@ -283,8 +281,8 @@ function checkCoreURL {
 		if [ "$DOWNLOAD_NEW_CORES" != "false" ] || [ "$MAX_LOCAL_VERSION" != "" ] || [ "$BASE_FILE_NAME" == "MiSTer" ] || [ "$BASE_FILE_NAME" == "menu" ] || { echo "$CORE_URL" | grep -q "SD-Installer"; }
 		then
 			echo "Downloading $FILE_NAME"
-			[ "${SSH_CLIENT}" != "" ] && echo "URL: https://github.com$MAX_RELEASE_URL?raw=true"
-			if curl $CURL_RETRY $SSL_SECURITY_OPTION -L "https://github.com$MAX_RELEASE_URL?raw=true" -o "$CURRENT_DIR/$FILE_NAME"
+			[ "${SSH_CLIENT}" != "" ] && echo "URL: $MAX_RELEASE_URL"
+			if curl $CURL_RETRY $SSL_SECURITY_OPTION -L "$MAX_RELEASE_URL" -o "$CURRENT_DIR/$FILE_NAME"
 			then
 				if [ ${DELETE_OLD_FILES} == "true" ]
 				then
@@ -348,7 +346,9 @@ function checkCoreURL {
 			echo "New core: $FILE_NAME"
 		fi
 	else
-		echo "Core is up to date!"
+
+echo "Core is up to date!"
+
 	fi
 	
 	echo ""
@@ -383,6 +383,11 @@ wait
 
 echo "All RetroDriven Cores have been Updated!"
 echo
+echo "Please visit RetroDriven.com for all of your MiSTer and Retro News!"
+echo
+sleep 5
+
+
 if [ $REBOOT_NEEDED == "true" ]
 then
 	if [ $AUTOREBOOT == "true" ]