From 69e9c88a25f7dfee45838ea697ad15c3972ce2ed Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 28 Feb 2022 21:13:03 +0200
Subject: [PATCH 52/52] Windows ruledit-installers: Fix listing of available
 rulesets

See osdn #43983

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../create-freeciv-ruledit-nsi.sh             | 25 +++++++------------
 .../create-freeciv-ruledit-nsi.sh             | 25 +++++++------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/windows/installer_cross/create-freeciv-ruledit-nsi.sh b/windows/installer_cross/create-freeciv-ruledit-nsi.sh
index 2738dcc161..83ddb81df2 100755
--- a/windows/installer_cross/create-freeciv-ruledit-nsi.sh
+++ b/windows/installer_cross/create-freeciv-ruledit-nsi.sh
@@ -88,15 +88,14 @@ EOF
   echo -n "/x locale "
 
   # rulesets
-  find $1/data -mindepth 1 -maxdepth 1 -name *.serv -printf %f\\n |
-  sed 's|.serv||' |
+  find $1/data -mindepth 2 -maxdepth 2 -name game.ruleset -printf %P\\n |
+  sed 's|/game.ruleset||' |
   while read -r name
   do
-  if test "x$name" != "xdefault" ; then
-  echo -n "/x $name.serv /x $name "
-  else
-  echo -n "/x $name.serv "
-  fi
+    echo -n "/x $name "
+    if test -f "$1/data/$name.modpack" ; then
+      echo -n "/x $name.modpack "
+    fi
   done
 
   echo "$1\\*.*"
@@ -136,24 +135,18 @@ SectionGroup "Rulesets"
 
 EOF
 
-find $1/data -mindepth 1 -maxdepth 1 -name *.serv -printf %f\\n |
+find $1/data -mindepth 2 -maxdepth 2 -name game.ruleset -printf %P\\n |
 sort |
-sed 's|.serv||' |
+sed 's|/game.ruleset||' |
 while read -r name
 do
-if test -d $1/data/$name; then
-# 'default' directory is not optional
-if test "x$name" != "xdefault" ; then
+# Intentionally leave .modpack out. Ruledit does not use it.
 echo "  Section \"$name\""
-# Intentionally left .serv out. Ruledit does not use it.
-# This script does use it, though, to detect rulesets.
 echo "  SetOutPath \$INSTDIR/data/$name" | sed 's,/,\\,g'
 echo "  File /r $1/data/$name/*.*"
 echo "  SetOutPath \$INSTDIR"
 echo "  SectionEnd"
 echo
-fi
-fi
 done
 
 cat <<EOF
diff --git a/windows/installer_msys2/create-freeciv-ruledit-nsi.sh b/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
index 981e215874..d8d4a8bd37 100644
--- a/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
+++ b/windows/installer_msys2/create-freeciv-ruledit-nsi.sh
@@ -88,15 +88,14 @@ EOF
   echo -n "/x locale "
 
   # rulesets
-  find $1/data -mindepth 1 -maxdepth 1 -name *.serv -printf %f\\n |
-  sed 's|.serv||' |
+  find $1/data -mindepth 2 -maxdepth 2 -name game.ruleset -printf %P\\n |
+  sed 's|/game.ruleset||' |
   while read -r name
   do
-  if test "x$name" != "xdefault" ; then
-  echo -n "/x $name.serv /x $name "
-  else
-  echo -n "/x $name.serv "
-  fi
+    echo -n "/x $name "
+    if test -f "$1/data/$name.modpack" ; then
+      echo -n "/x $name.modpack "
+    fi
   done
 
   echo "$1\\*.*"
@@ -136,24 +135,18 @@ SectionGroup "Rulesets"
 
 EOF
 
-find $1/data -mindepth 1 -maxdepth 1 -name *.serv -printf %f\\n |
+find $1/data -mindepth 2 -maxdepth 2 -name game.ruleset -printf %P\\n |
 sort |
-sed 's|.serv||' |
+sed 's|/game.ruleset||' |
 while read -r name
 do
-if test -d $1/data/$name; then
-# 'default' directory is not optional
-if test "x$name" != "xdefault" ; then
+# Intentionally leave .modpack out. Ruledit does not use it.
 echo "  Section \"$name\""
-# Intentionally left .serv out. Ruledit does not use it.
-# This script does use it, though, to detect rulesets.
 echo "  SetOutPath \$INSTDIR\\data\\$name"
 echo "  File /r $1\\data\\$name\*.*"
 echo "  SetOutPath \$INSTDIR"
 echo "  SectionEnd"
 echo
-fi
-fi
 done
 
 cat <<EOF
-- 
2.34.1