[Morphix-cvs] SF.net SVN: morphix: [2187] trunk/morph-scripts

[<bms...@us...>]

Revision: 2187
Author:   bmsleight
Date:     2006-03-30 11:57:04 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2187&view=rev

Log Message:
-----------
Ok, so I tested the deb building this time. Makefile are still weird even after you get the filenames correct

Modified Paths:
--------------
    trunk/morph-scripts/Makefile
    trunk/morph-scripts/debian/rules

Added Paths:
-----------
    trunk/morph-scripts/morphmini/morphmini

Removed Paths:
-------------
    trunk/morph-scripts/morphmini/morphimini
Modified: trunk/morph-scripts/Makefile
===================================================================
--- trunk/morph-scripts/Makefile	2006-03-29 22:01:20 UTC (rev 2186)
+++ trunk/morph-scripts/Makefile	2006-03-30 19:57:04 UTC (rev 2187)
@@ -1,7 +1,7 @@
 
 all: install
 
-install: i2mainmod isomorph modulebuilder changekernel minimodgen debget moduleextractor moduleloader add_to_iso convert_to_bootimg morphing-morphix morphing-morphmini
+install: i2mainmod isomorph modulebuilder changekernel minimodgen debget moduleextractor moduleloader add_to_iso convert_to_bootimg morphing-morphix morphix-morphmini
 
 build_minimod:
 	mkdir -p $(DESTDIR)/usr/sbin
@@ -65,20 +65,20 @@
 	cp ./module-extractor.pl $(DESTDIR)/usr/sbin/module-extractor
 	chmod a+x $(DESTDIR)/usr/sbin/module-extractor
 
-morphing-morphix:
+morphing-morphix: 
 	mkdir -p $(DESTDIR)/usr/sbin
 	mkdir -p $(DESTDIR)/usr/share
 	mkdir -p $(DESTDIR)/usr/share/doc
 	mkdir -p $(DESTDIR)/usr/share/doc/morphing-morphix/
 	cp ./mmorphix/morphing-morphix $(DESTDIR)/usr/sbin/morphing-morphix
 	cp ./mmorphix/morphing-morphix.messages $(DESTDIR)/usr/share/doc/morphing-morphix/morphing-morphix.messages
-	chmod a+x $(DESTDIR)/usr/sbin/morphing-morphix
+	chmod a+x $(DESTDIR)/usr/sbin/morphing-morphix 	
 
 morphix-morphmini:
 	mkdir -p $(DESTDIR)/usr/sbin
 	cp ./morphmini/morphmini $(DESTDIR)/usr/sbin/morphmini
 	chmod a+x $(DESTDIR)/usr/sbin/morphmini
-	
+
 remove:
 	rm $(DESTDIR)/usr/sbin/install2mainmod
 	rm $(DESTDIR)/usr/sbin/isomorph.pl

Modified: trunk/morph-scripts/debian/rules
===================================================================
--- trunk/morph-scripts/debian/rules	2006-03-29 22:01:20 UTC (rev 2186)
+++ trunk/morph-scripts/debian/rules	2006-03-30 19:57:04 UTC (rev 2187)
@@ -64,7 +64,7 @@
 	$(MAKE) debget DESTDIR=$(CURDIR)/debian/morphix-deb-get
 	$(MAKE) makeiso DESTDIR=$(CURDIR)/debian/morphix-make-iso
 	$(MAKE) morphing-morphix DESTDIR=$(CURDIR)/debian/morphing-morphix
-	$(MAKE) morphmini DESTDIR=$(CURDIR)/debian/morphmini
+	$(MAKE) morphix-morphmini DESTDIR=$(CURDIR)/debian/morphix-morphmini
 	dh_install -s
 
 # Must not depend on anything. This is to be called by

Deleted: trunk/morph-scripts/morphmini/morphimini
===================================================================
--- trunk/morph-scripts/morphmini/morphimini	2006-03-29 22:01:20 UTC (rev 2186)
+++ trunk/morph-scripts/morphmini/morphimini	2006-03-30 19:57:04 UTC (rev 2187)
@@ -1,169 +0,0 @@
-#!/bin/bash
-#
-# Copyleft (c) 2006 Brendan M. Sleight                    #
-#              <bmsleight@barwap._REMOVE_SPAM_TRAP.com>   # 
-#                                                         #
-# This script is licensed under the GNU GPL v2 or later.  #
-#                                                         #
-# On Debian systems, this license can be obtained via     #
-# /usr/share/common-licenses/GPL                          #
-#
-
-get_global_variables ()
-{
- TMP_DIR=/tmp/morphixmini.$$
- TMP_FILE=/tmp/morphixmini.$$.tmp
- TMP_FILE_2=/tmp/morphixmini.$$.2.tmp
- RETURN_VALUE=""
-}
-
-set_up_module_build ()
-{
-mkdir $TMP_DIR					2>/dev/null
-mkdir $TMP_DIR/minimod/				2>/dev/null
-mkdir $TMP_DIR/minimod/morphix			2>/dev/null
-mkdir $TMP_DIR/minimod/morphix/files 		2>/dev/null
-mkdir $TMP_DIR/minimod/morphix/junk 		2>/dev/null
-dd if=/dev/urandom of=$TMP_DIR/minimod/morphix/junk/minimum_minimod_size.junk bs=1k count=2  2>/dev/null
-cp $TEMPLATE $TMP_DIR/minimod/morphix/
-echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/loadmod.sh
-chmod a+x $TMP_DIR/minimod/morphix/loadmod.sh
-}
-
-
-xml_get ()
-{
- RETURN_VALUE=$(xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 |  sed 's/^[ \t]*//' | sed  /^$/d)
-}
-
-xml_get_tmp ()
-{
- xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 |  sed 's/^[ \t]*//' | sed  /^$/d >$TMP_FILE
- convert_quoted_chars
-}
-
-
-write_tags_and_desciptions ()
-{
-xml_get "//minimod" "maintag" "maintag" $TEMPLATE
-echo "$RETURN_VALUE" 			>$TMP_DIR/minimod/morphix/main_module
-xml_get "//minimod" "minitag" "maintag" $TEMPLATE
-echo "$RETURN_VALUE" 			>$TMP_DIR/minimod/morphix/mini_module
-xml_get "//minimod" "description" "description" $TEMPLATE
-echo "$RETURN_VALUE" 			>$TMP_DIR/minimod/morphix/mini_module
-xml_get "//minimod" "minitag" "minitag" $TEMPLATE
-echo "$RETURN_VALUE" 			>>$TMP_DIR/minimod/morphix/mini_module
-}
-
-process_filelist ()
-{
-xml_get_tmp //minimod/filelist local file $TEMPLATE
-RETURN_VALUE=$(cat $TMP_FILE)
-for CP_FILES in $RETURN_VALUE
-do 
- cp -p $CP_FILES $TMP_DIR/minimod/morphix/files/
-done
-xml_get_tmp //minimod/filelist remote file $TEMPLATE
-RETURN_VALUE=$(cat $TMP_FILE)
-for CP_FILES in $RETURN_VALUE
-do 
- wget --tries=3 --timeout=60 --directory-prefix=$TMP_DIR/minimod/morphix/files/ $CP_FILES
-done
-}
-
-process_command_prex ()
-{
-xml_get_tmp //minimod/commandlist preX command $TEMPLATE
-#sed -e 's/^/\/bin\/sh /g' $TMP_FILE >>$TMP_DIR/minimod/morphix/loadmod.sh
-if [ -s $TMP_FILE ]
-then
-  cat $TMP_FILE >>$TMP_DIR/minimod/morphix/loadmod.sh
-fi
-}
-
-process_command_x ()
-{
-xml_get_tmp //minimod/commandlist X command $TEMPLATE
-if [ -s $TMP_FILE ]
-then
-  echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/commandsX.sh 
-  cat  $TMP_FILE >>$TMP_DIR/minimod/morphix/commandsX.sh
-  chmod a+x $TMP_DIR/minimod/morphix/commandsX.sh
-  DOLLAR="$"
-  DOLLARSTARTX=$DOLLAR"STARTX"
-  DOLLAR1=$DOLLAR"1"
-  DOLLARUSER=$DOLLAR"USER"
-  cat >>$TMP_DIR/minimod/morphix/loadmod.sh <<EOF
-USER=$DOLLAR(cat /etc/sysconfig/username)
-(while [ -z $DOLLARSTARTX ]; do  STARTX=$DOLLAR(ps -C x-session-manager -o pid=); sleep 1; done ; su -c "export DISPLAY=:0.0 ; \\
-$DOLLAR1/morphix/commandsX.sh $DOLLAR1  \\
-" - $DOLLARUSER  ) &
-EOF
-fi
-}
-
-process_command_postx ()
-{
-xml_get_tmp //minimod/commandlist postX command $TEMPLATE
-if [ -s $TMP_FILE ]
-then
-  echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/commandsPostX.sh 
-  chmod a+x $TMP_DIR/minimod/morphix/commandsPostX.sh
-  cat $TMP_FILE >>$TMP_DIR/minimod/morphix/commandsPostX.sh
-  
-  #Alex will hate this
-  #This will make sure that commandsPostX.sh has correct $1 from minimodule
-  DOLLAR="$"
-  DOLLAR1=$DOLLAR"1"
-  echo "echo \"#!/bin/sh \"    		> /morphix/rc.m/S11PostX11.sh " >>$TMP_DIR/minimod/morphix/loadmod.sh
-  echo "echo \"$DOLLAR1/morphix/commandsPostX.sh $DOLLAR1 \" >> /morphix/rc.m/S11PostX11.sh " 	>>$TMP_DIR/minimod/morphix/loadmod.sh
-  echo "chmod a+x /morphix/rc.m/S11PostX11.sh " 	>>$TMP_DIR/minimod/morphix/loadmod.sh
-fi
-}
-
-build_minimodule ()
-{
-module-builder $TMP_DIR/minimod/ $BMODULE
-}
-
-remove_minimodule_tmp ()
-{
-rm $TMP_DIR -r	2>/dev/null
-rm $TMP_FILE	2>/dev/null
-rm $TMP_FILE_2	2>/dev/null
-}
-
-convert_quoted_chars ()
-{
-AMP="\&amp;/\&"
-sed -e s/$AMP/g $TMP_FILE >$TMP_FILE_2
-AMP="\&lt;/<"
-sed -e s/$AMP/g  $TMP_FILE_2 >$TMP_FILE
-AMP="\&gt;/>"
-sed -e s/$AMP/g  $TMP_FILE >$TMP_FILE_2
-AMP="\&quot;/\""
-sed -e s/$AMP/g  $TMP_FILE_2 >$TMP_FILE
-}
-
-
-#Main loop
-
-#Confirm parameters
-TEMPLATE=$1
-BMODULE=$2
-if [ -z "$TEMPLATE" -a -z "$BMODULE" ]; then
-    echo "Usage: $0 template.xml output.mod"
-    echo
-    exit
-fi
-
-
-get_global_variables
-set_up_module_build
-write_tags_and_desciptions
-process_filelist
-process_command_prex
-process_command_postx
-process_command_x
-build_minimodule
-remove_minimodule_tmp

Added: trunk/morph-scripts/morphmini/morphmini
===================================================================
--- trunk/morph-scripts/morphmini/morphmini	                        (rev 0)
+++ trunk/morph-scripts/morphmini/morphmini	2006-03-30 19:57:04 UTC (rev 2187)
@@ -0,0 +1,169 @@
+#!/bin/bash
+#
+# Copyleft (c) 2006 Brendan M. Sleight                    #
+#              <bmsleight@barwap._REMOVE_SPAM_TRAP.com>   # 
+#                                                         #
+# This script is licensed under the GNU GPL v2 or later.  #
+#                                                         #
+# On Debian systems, this license can be obtained via     #
+# /usr/share/common-licenses/GPL                          #
+#
+
+get_global_variables ()
+{
+ TMP_DIR=/tmp/morphixmini.$$
+ TMP_FILE=/tmp/morphixmini.$$.tmp
+ TMP_FILE_2=/tmp/morphixmini.$$.2.tmp
+ RETURN_VALUE=""
+}
+
+set_up_module_build ()
+{
+mkdir $TMP_DIR					2>/dev/null
+mkdir $TMP_DIR/minimod/				2>/dev/null
+mkdir $TMP_DIR/minimod/morphix			2>/dev/null
+mkdir $TMP_DIR/minimod/morphix/files 		2>/dev/null
+mkdir $TMP_DIR/minimod/morphix/junk 		2>/dev/null
+dd if=/dev/urandom of=$TMP_DIR/minimod/morphix/junk/minimum_minimod_size.junk bs=1k count=2  2>/dev/null
+cp $TEMPLATE $TMP_DIR/minimod/morphix/
+echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/loadmod.sh
+chmod a+x $TMP_DIR/minimod/morphix/loadmod.sh
+}
+
+
+xml_get ()
+{
+ RETURN_VALUE=$(xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 |  sed 's/^[ \t]*//' | sed  /^$/d)
+}
+
+xml_get_tmp ()
+{
+ xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 |  sed 's/^[ \t]*//' | sed  /^$/d >$TMP_FILE
+ convert_quoted_chars
+}
+
+
+write_tags_and_desciptions ()
+{
+xml_get "//minimod" "maintag" "maintag" $TEMPLATE
+echo "$RETURN_VALUE" 			>$TMP_DIR/minimod/morphix/main_module
+xml_get "//minimod" "minitag" "maintag" $TEMPLATE
+echo "$RETURN_VALUE" 			>$TMP_DIR/minimod/morphix/mini_module
+xml_get "//minimod" "description" "description" $TEMPLATE
+echo "$RETURN_VALUE" 			>$TMP_DIR/minimod/morphix/mini_module
+xml_get "//minimod" "minitag" "minitag" $TEMPLATE
+echo "$RETURN_VALUE" 			>>$TMP_DIR/minimod/morphix/mini_module
+}
+
+process_filelist ()
+{
+xml_get_tmp //minimod/filelist local file $TEMPLATE
+RETURN_VALUE=$(cat $TMP_FILE)
+for CP_FILES in $RETURN_VALUE
+do 
+ cp -p $CP_FILES $TMP_DIR/minimod/morphix/files/
+done
+xml_get_tmp //minimod/filelist remote file $TEMPLATE
+RETURN_VALUE=$(cat $TMP_FILE)
+for CP_FILES in $RETURN_VALUE
+do 
+ wget --tries=3 --timeout=60 --directory-prefix=$TMP_DIR/minimod/morphix/files/ $CP_FILES
+done
+}
+
+process_command_prex ()
+{
+xml_get_tmp //minimod/commandlist preX command $TEMPLATE
+#sed -e 's/^/\/bin\/sh /g' $TMP_FILE >>$TMP_DIR/minimod/morphix/loadmod.sh
+if [ -s $TMP_FILE ]
+then
+  cat $TMP_FILE >>$TMP_DIR/minimod/morphix/loadmod.sh
+fi
+}
+
+process_command_x ()
+{
+xml_get_tmp //minimod/commandlist X command $TEMPLATE
+if [ -s $TMP_FILE ]
+then
+  echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/commandsX.sh 
+  cat  $TMP_FILE >>$TMP_DIR/minimod/morphix/commandsX.sh
+  chmod a+x $TMP_DIR/minimod/morphix/commandsX.sh
+  DOLLAR="$"
+  DOLLARSTARTX=$DOLLAR"STARTX"
+  DOLLAR1=$DOLLAR"1"
+  DOLLARUSER=$DOLLAR"USER"
+  cat >>$TMP_DIR/minimod/morphix/loadmod.sh <<EOF
+USER=$DOLLAR(cat /etc/sysconfig/username)
+(while [ -z $DOLLARSTARTX ]; do  STARTX=$DOLLAR(ps -C x-session-manager -o pid=); sleep 1; done ; su -c "export DISPLAY=:0.0 ; \\
+$DOLLAR1/morphix/commandsX.sh $DOLLAR1  \\
+" - $DOLLARUSER  ) &
+EOF
+fi
+}
+
+process_command_postx ()
+{
+xml_get_tmp //minimod/commandlist postX command $TEMPLATE
+if [ -s $TMP_FILE ]
+then
+  echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/commandsPostX.sh 
+  chmod a+x $TMP_DIR/minimod/morphix/commandsPostX.sh
+  cat $TMP_FILE >>$TMP_DIR/minimod/morphix/commandsPostX.sh
+  
+  #Alex will hate this
+  #This will make sure that commandsPostX.sh has correct $1 from minimodule
+  DOLLAR="$"
+  DOLLAR1=$DOLLAR"1"
+  echo "echo \"#!/bin/sh \"    		> /morphix/rc.m/S11PostX11.sh " >>$TMP_DIR/minimod/morphix/loadmod.sh
+  echo "echo \"$DOLLAR1/morphix/commandsPostX.sh $DOLLAR1 \" >> /morphix/rc.m/S11PostX11.sh " 	>>$TMP_DIR/minimod/morphix/loadmod.sh
+  echo "chmod a+x /morphix/rc.m/S11PostX11.sh " 	>>$TMP_DIR/minimod/morphix/loadmod.sh
+fi
+}
+
+build_minimodule ()
+{
+module-builder $TMP_DIR/minimod/ $BMODULE
+}
+
+remove_minimodule_tmp ()
+{
+rm $TMP_DIR -r	2>/dev/null
+rm $TMP_FILE	2>/dev/null
+rm $TMP_FILE_2	2>/dev/null
+}
+
+convert_quoted_chars ()
+{
+AMP="\&amp;/\&"
+sed -e s/$AMP/g $TMP_FILE >$TMP_FILE_2
+AMP="\&lt;/<"
+sed -e s/$AMP/g  $TMP_FILE_2 >$TMP_FILE
+AMP="\&gt;/>"
+sed -e s/$AMP/g  $TMP_FILE >$TMP_FILE_2
+AMP="\&quot;/\""
+sed -e s/$AMP/g  $TMP_FILE_2 >$TMP_FILE
+}
+
+
+#Main loop
+
+#Confirm parameters
+TEMPLATE=$1
+BMODULE=$2
+if [ -z "$TEMPLATE" -a -z "$BMODULE" ]; then
+    echo "Usage: $0 template.xml output.mod"
+    echo
+    exit
+fi
+
+
+get_global_variables
+set_up_module_build
+write_tags_and_desciptions
+process_filelist
+process_command_prex
+process_command_postx
+process_command_x
+build_minimodule
+remove_minimodule_tmp


Property changes on: trunk/morph-scripts/morphmini/morphmini
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.