Updating to vimacs current pair of scripts - genpxml and pnd_make

diff --git a/testdata/scripts/genpxml.sh b/testdata/scripts/genpxml.sh
index 84392fb..dd0aa8e 100755 (executable)
--- a/testdata/scripts/genpxml.sh
+++ b/testdata/scripts/genpxml.sh
@@ -7,30 +7,43 @@ if [ -x $x ] && [ ! -d $x ]; then exe=$x; break; fi
 done
 BASENAMEnoex=$(basename "$exe" | cut -d'.' -f1)
 BASENAME=$(basename "$exe")
+rnd=$RANDOM;
+loc=$(dirname "$0")
  
-rnd=$(dd if=/dev/random count=10 bs=1 | hexdump  | cut -d \  -f 2-| head -n 1 | tr -d " ")
+echo '
+<?xml version="1.0" encoding="UTF-8"?>
+<PXML xmlns="http://openpandora.org/namespaces/PXML" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="'$BASENAME-$rnd'" xsi:noNamespaceSchemaLocation="PXML_schema.xsd">
+  <title lang="en_US">'$BASENAMEnoex'</title>
+  <title lang="de_DE">'$BASENAMEnoex' - German (lol!)</title>
  
-echo '<?xml version="1.0"?>
-<PXML>
-<title>
-       <en>'$BASENAMEnoex'</en>
-</title>
+  <exec command="'$BASENAME'"/>
  
-<unique_id>'$rnd'</unique_id>
+  <description lang="en_US">en_US Automatically generated pxml from'$(pwd)' exe='$BASENAME'</description>
+  <description lang="de_DE">de_DE Automatisch generiertes pxml aus'$(pwd)' exe='$BASENAME'</description>
  
-<standalone>NO</standalone>
+  <previewpics>'
+for image in $(file -i -0 * | grep -a image | cut -d" " -f1)
+do
+echo "<pic src="$image"/>"
+done
+echo '  </previewpics>
  
-<description>
-       <en>Automatically generated pxml from'$(pwd)' exe='$BASENAME'</en>
-</description>
+  <author name="'$USERNAME'" website="http://www.openpandora.org"/><!--Optional email and website, name required-->
  
-<exec>'$BASENAME'</exec>
+  <version major="1" minor="1" release="1" build="2"/><!--This programs version-->
+  <osversion major="1" minor="0" release="0" build="0"/><!--The minimum OS version required-->
  
-<category>
-       <main>Main category</main>
-       <subcategory1>Subcategory 1</subcategory1>
-       <subcategory2>Subcategory 2</subcategory2>
-</category>
+  <categories>
+    <category name="Main category"><!--category like "Games", "Graphics", "Internet" etc-->
+    <subcategory name="Subcategory 1"/><!--subcategory, like "Board Games", "Strategy", "First Person Shooters"-->
+    <subcategory name="Subcategory 2"/>
+    </category>
+    <category name="Alternative category">
+      <subcategory name="Alternative Subcategory 1"/>
+    </category>
+  </categories>
  
+  <clockspeed frequency="600"/><!--Frequency in Hz-->
 </PXML>
-'
\ No newline at end of file
+'

diff --git a/testdata/scripts/pnd_make.sh b/testdata/scripts/pnd_make.sh
index 0794b34..2586ac6 100755 (executable)
--- a/testdata/scripts/pnd_make.sh
+++ b/testdata/scripts/pnd_make.sh
@@ -19,17 +19,17 @@ while true ; do
        esac
 done
  
-rnd=$RANDOM%10; # random number for genpxml and index$rnd.xml
+rnd=$RANDOM; # random number for genpxml and index$rnd.xml
  
 if [ $PXML = "guess" ] && [  $PNDNAME ] && [ $FOLDER ];  then
-       PXMLtxt=$(/usr/pandora/scripts $FOLDER)
+       PXMLtxt=$(~/pndtest/genxml.sh $FOLDER $ICON)
        PXML=tmp$rnd.pxml
        echo "$PXMLtxt" > tmp$rnd.pxml
 fi
  
 if [ ! $PNDNAME ] || [ ! $FOLDER ] || [ ! $PXML ]; then
        echo " Usage: pnd_make.sh -p your.pnd -d folder/containing/your/app/ -x 
-       your.pxml (or \"guess\" to try to generate it from the folder) other files to append"
+       your.pxml (or \"guess\" to try to generate it from the folder) -i icon.png"
        exit 1
 fi
  
@@ -54,4 +54,5 @@ fi
  
 if [ $PXML = "guess" ];then rm tmp$rnd.pxml; fi
  
-#printf %08d $pxmlstart >> $PNDNAME #append end of iso/start of pxml offset
\ No newline at end of file
+#printf %08d $pxmlstart >> $PNDNAME #append end of iso/start of pxml offset
+