Menu
▾
▴
[Morphix-cvs] SF.net SVN: morphix: [2323] trunk/morph-scripts
|
From: <bms...@us...> - 2006-06-24 21:55:10
|
Revision: 2323 Author: bmsleight Date: 2006-06-24 14:54:59 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2323&view=rev Log Message: ----------- Still testing, help files in grub not now changes. White background for grub. Thanks to aquatix for testing. Modified Paths: -------------- trunk/morph-scripts/debian/changelog trunk/morph-scripts/debian/rules trunk/morph-scripts/morphix-rebrand.sh trunk/morph-scripts/morphmini/example.xml Modified: trunk/morph-scripts/debian/changelog =================================================================== --- trunk/morph-scripts/debian/changelog 2006-06-23 21:44:47 UTC (rev 2322) +++ trunk/morph-scripts/debian/changelog 2006-06-24 21:54:59 UTC (rev 2323) @@ -1,3 +1,9 @@ +morph-scripts (0.2-25) unstable; urgency=low + + * bump + + -- bmsleight <bms...@ba...> Wed, 24 Jun 2006 17:00:00 +0100 + morph-scripts (0.2-24) unstable; urgency=low * fixing morphix-rebrand bugs Modified: trunk/morph-scripts/debian/rules =================================================================== --- trunk/morph-scripts/debian/rules 2006-06-23 21:44:47 UTC (rev 2322) +++ trunk/morph-scripts/debian/rules 2006-06-24 21:54:59 UTC (rev 2323) @@ -93,6 +93,7 @@ dh_installman -p morphix-modulebuilder debian/module-builder.1 dh_installman -p morphix-moduleextractor debian/module-extractor.1 dh_installman -p morphix-morphmini debian/morphmini.1 + dh_installman -p morphix-morphmini debian/morphix-rebrand.1 dh_link dh_strip dh_compress Modified: trunk/morph-scripts/morphix-rebrand.sh =================================================================== --- trunk/morph-scripts/morphix-rebrand.sh 2006-06-23 21:44:47 UTC (rev 2322) +++ trunk/morph-scripts/morphix-rebrand.sh 2006-06-24 21:54:59 UTC (rev 2323) @@ -23,7 +23,8 @@ TMP=$(basename "${GRAPHIC}") TITLE=${TMP%.*} TITLE=$(echo "$TITLE" | tr -cd '[:alnum:]') - echo "New title: $TITLE" + TITLE_LC=$(echo "$TITLE" | tr A-Z a-z) + echo "New title: $TITLE $TITLE_LC" } full_path () @@ -89,8 +90,7 @@ #Add BOOT_IMAGE username and hostname for TMP_GRUB_FILE in $NEW_IMAGE_DIR/boot/grub/*.lst do - sed "/kernel/s/$/ BOOT_IMAGE=$TITLE hostname=$TITLE username=$TITLE /" $TMP_GRUB_FILE > $TMP_FILE -# sed "/kernel/s/$/ hostname=$TITLE username=$TITLE /" $TMP_GRUB_FILE > $TMP_FILE + sed "/kernel/s/$/ BOOT_IMAGE=$TITLE hostname=$TITLE username=$TITLE_LC /" $TMP_GRUB_FILE > $TMP_FILE mv $TMP_FILE $TMP_GRUB_FILE done } @@ -104,15 +104,15 @@ { #/usr/share/morphix-rebrand/morphix-iso-grubtheme_0.1-4.tar.gz - to package tar zxvf /usr/share/morphix-rebrand/morphix-iso-grubtheme_0.1-4.tar.gz -C $TMP_DIR 1>/dev/null 2>&1 -convert -size 640x503 xc:blue $TMP_DIR/background_tr.png +convert -size 640x503 xc:white $TMP_DIR/background_tr.png convert -size 160x215 xc:darkblue $TMP_DIR/background_br.png convert -size 434x341 xc:darkblue $TMP_DIR/grubmenu.png convert $GRAPHIC -resize 160x126 $TMP_DIR/resize.png convert -background none -fill white -gravity North -pointsize 24 -size 148x183 caption:"Welcome to $TITLE LiveCD" $TMP_DIR/title.png convert -page 640x503+172+34 $TMP_DIR/grubmenu.png -page 640x503+6+34 $TMP_DIR/resize.png -page 640x503+12+166 $TMP_DIR/title.png -page 640x503+6+160 $TMP_DIR/background_br.png -page 640x503+0,0 $TMP_DIR/background_tr.png -background none -compose DstOver -flatten $TMP_DIR/grub.pcx convert $TMP_DIR/grub.pcx -resize 640x503! -colors 14 -depth 8 $TMP_DIR/gfxboot-grub-0.1/background.pcx -sed "s/$OLD_TITLE/$TITLE/g" $TMP_DIR/gfxboot-grub-0.1/help-boot.en.html >$TMP_FILE -mv $TMP_FILE $TMP_DIR/gfxboot-grub-0.1/help-boot.en.html +#sed "s/$OLD_TITLE/$TITLE/g" $TMP_DIR/gfxboot-grub-0.1/help-boot.en.html >$TMP_FILE +#mv $TMP_FILE $TMP_DIR/gfxboot-grub-0.1/help-boot.en.html cd $TMP_DIR/gfxboot-grub-0.1/ && make >/dev/null 2>%1 cp $TMP_DIR/gfxboot-grub-0.1/boot/message $NEW_IMAGE_DIR/boot/grub } Modified: trunk/morph-scripts/morphmini/example.xml =================================================================== --- trunk/morph-scripts/morphmini/example.xml 2006-06-23 21:44:47 UTC (rev 2322) +++ trunk/morph-scripts/morphmini/example.xml 2006-06-24 21:54:59 UTC (rev 2323) @@ -10,15 +10,13 @@ <local> <file>/home/morph/test.jpg</file> <file>/home/morph/test2.jpg</file> - <file>/home/morph/test3.jpg</file> - <file>/home/morph/test4.jpg</file> </local> <remote> <file>http://www.barwap.com/morphix/mmorphix/morphixsound2.wav</file> </remote> </filelist> <root> <!-- Files or Packages to be overlaid on the rootfile system - good for saving ramspace--> - <!-- root currently ignores bootption and will always overlay the files --> + <!-- root currently ignores bootoption and will always overlay the files --> <files> <local> <from>/home/morph/test.jpg</from> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
