Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=b5c4121334c22c406d6a7c906bd32ed821b18d64
commit b5c4121334c22c406d6a7c906bd32ed821b18d64
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Tue Feb 12 18:04:43 2008 +0100
replace FOO with @FOO@ if it'll be replaced
we already did this somewhere but now it's replaced everywhere
diff --git a/Makefile b/Makefile
index bc13316..047969b 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ check-tree:
done
parse_cmdline: parse_cmdline.in
- sed 's/FWLLLANG/$(FWLLLANG)/' [EMAIL PROTECTED] > $@
+ sed 's/@FWLLLANG@/$(FWLLLANG)/' [EMAIL PROTECTED] > $@
xorg.conf: xorg.conf.in
sed 's/@FWLSLANG@/$(FWLSLANG)/' [EMAIL PROTECTED] > $@
@@ -203,12 +203,12 @@ create-users: checkroot
sed "s|root::$$rof|root:$$rootpass:$$rof|" -i ${CHROOTDIR}/${TREE}/etc/shadow; \
echo "${FWLUSER} ALL=(ALL) NOPASSWD:ALL" >${CHROOTDIR}/${TREE}/etc/sudoers; \
rm -f ${CHROOTDIR}/${TREE}/etc/issue; \
- sed "s|VENDOR|${VENDOR}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
- sed "s|FWLREL|$(shell ${FWLREL}) (${FWLCODENAME})|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
- sed "s|USERNAME|${FWLUSER}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
- sed "s|USERPASS|${FWUSERPASS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
- sed "s|ROOTPASS|${FWROOTPASS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
- sed "s|SAVE_DIRS|${SAVEDIRS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/configsave; \
+ sed "s|@VENDOR@|${VENDOR}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
+ sed "s|@FWLREL@|$(shell ${FWLREL}) (${FWLCODENAME})|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
+ sed "s|@USERNAME@|${FWLUSER}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
+ sed "s|@USERPASS@|${FWUSERPASS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
+ sed "s|@ROOTPASS@|${FWROOTPASS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/parse_cmdline; \
+ sed "s|@SAVE_DIRS@|${SAVEDIRS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/configsave; \
fi
live-base: checkroot
diff --git a/configsave b/configsave
index c63fda8..a998172 100644
--- a/configsave
+++ b/configsave
@@ -17,7 +17,7 @@ fi
FWCONF=fwliveconf.lzm
MEMORY=/$MOUNTDIR/live/memory
CHANGES=$MEMORY/changes
-SAVEDIRS=" SAVE_DIRS"
+SAVEDIRS=" @SAVE_DIRS@"
CONFFILE=$1
if [ "$CONFFILE" = "" ]; then printf $"usage: %s /media/sda?/%s\n" $0 $FWCONF;
exit 1; fi
diff --git a/parse_cmdline.in b/parse_cmdline.in
index 87af4b1..9b47a8d 100644
--- a/parse_cmdline.in
+++ b/parse_cmdline.in
@@ -7,7 +7,7 @@
TEXTDOMAIN=fwlive
TEXTDOMAINDIR=/usr/share/locale
-deflang="FWLLLANG"
+deflang="@FWLLLANG@"
lang=`grep lang /proc/cmdline|sed 's/.*lang=\([^ ]*\)\( .*\|$\)/\1/'`
if [ -z "$lang" ]; then
@@ -45,14 +45,14 @@ gen_issue()
printf '[H[J\n'
printf '[1;32m
=================================================================================================[0;39m\n'
printf '[1;32m '
-printf $"Welcome to FWLive %s by %s" "FWLREL" "VENDOR"
+printf $"Welcome to FWLive %s by %s" "@FWLREL@" "@VENDOR@"
printf ' \l [0;39m\n'
printf '[1;32m
=================================================================================================[0;39m'
printf '\n\n'
printf ' [1;29m %s[0;29m\n\n ' $"The system is up and running now."
-printf $"Login as '%s', with password '%s' or" "USERNAME" "USERPASS"
+printf $"Login as '%s', with password '%s' or" "@USERNAME@" "@USERPASS@"
printf '\n '
-printf $"login as 'root', with password '%s', both without quotes, lowercase."
"ROOTPASS"
+printf $"login as 'root', with password '%s', both without quotes, lowercase."
"@ROOTPASS@"
printf '\n\n [1;29m %s[0;29m\n\n' $"After login, try the following commands:"
printf ' %s\n' $"mc .... to start Midnight Commander
(edit/copy/move/create/delete files)"
printf ' %s \n' $"configsave/configrestore - or use - service config
save/restore ..."
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
