Make the devkit move final

libretro-upgrade.sh

@@ -60,6 +60,46 @@ libretro_bsnes_one_copy() {
 fi
 }
 
+libretro_devkit_mgit_dir_0="libretro-manifest"
+libretro_devkit_mgit_dir_1="libretrodb"
+libretro_devkit_mgit_dir_2="libretro-dat-pull"
+libretro_devkit_mgit_dir_3="libretro-common"
+
+libretro_move_devkit() {
+	if [ -d "$WORKDIR/libretrodb" ]; then
+		found_nothing=""
+		if [ -d "$WORKDIR/libretro-devkit" ]; then
+			echo ""
+			echo "=== Detected multiple copies of libretro devkit"
+			echo "    devkit has moved to a subdir, but you have old copies installed."
+			echo ""
+			echo -n "    Would you like to delete the extras? [y/N] : "
+			read user
+			if [[ "$user" = "y" || "$user" == "Y" ]]; then
+				echo "    Removing old versions of devkit..."
+				rm -rf "$WORKDIR/libretro-manifest"
+				rm -rf "$WORKDIR/libretrodb"
+				rm -rf "$WORKDIR/libretro-dat-pull"
+				rm -rf "$WORKDIR/libretro-common"
+			else
+				echo "    Retaining devkit duplicates at your request."
+			fi
+		else
+			echo ""
+			echo "=== Detected devkit installed in working directory"
+			echo "    Found in \"$WORKDIR\""
+			echo "    Should be \"$WORKDIR/libretro-devkit\""
+			echo ""
+			echo "    will move it"
+			mkdir -p "$WORKDIR/libretro-devkit"
+			mv "$WORKDIR/libretro-manifest" "$WORKDIR/libretro-devkit"
+			mv "$WORKDIR/libretrodb" "$WORKDIR/libretro-devkit"
+			mv "$WORKDIR/libretro-dat-pull" "$WORKDIR/libretro-devkit"
+			mv "$WORKDIR/libretro-common" "$WORKDIR/libretro-devkit"
+		fi
+	fi
+}
+
 if [ -n "$1" ]; then
 	while [ -n "$1" ]; do
 		"$1"
@@ -68,6 +108,7 @@ if [ -n "$1" ]; then
 else
 	libretro_move_libretro_common
 	libretro_bsnes_one_copy
+	libretro_move_devkit
 fi
 if [ -n "$found_nothing" ]; then
 	echo "Nothing to upgrade."

rules.d/devkit-rules.sh

@@ -1,8 +1,6 @@
 # vim: set ts=3 sw=3 noet ft=sh : bash
 
 libretro_devkit_name="libretro Developer's Kit"
-# FIXME: Twinaphex, uncomment next line for libretro-super/libretrodb etc or delete, your choice
-#libretro_devkit_dir="."
 libretro_devkit_fetch_rule=multi_git
 libretro_devkit_mgit_urls=4
 libretro_devkit_mgit_dir_0="libretro-manifest"