Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=b0e75a146b67d5c699d324c73ab4c8f002287b18
commit b0e75a146b67d5c699d324c73ab4c8f002287b18
Author: janny <[EMAIL PROTECTED]>
Date: Thu Sep 27 14:28:48 2007 +0200
add locale issue
diff --git a/Makefile b/Makefile
index a277c25..7d34d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ NEED_FILES = fstab-update parse_cmdline.in xorg.conf.in
rc.fsupd \
INST_FILES_755 = /etc/rc.d/rc.fwlive /etc/rc.d/rc.config /etc/rc.d/rc.fsupd
/usr/local/bin/configsave \
/usr/local/bin/fileswap /usr/local/bin/fstab-update /usr/local/bin/xstart \
/usr/local/bin/parse_cmdline /etc/rc.d/rc.parse_cmdline
/tmp/live-base/tools/fpm2lzm
-INST_FILES_644 = /etc/issue /etc/X11/xorg.conf /boot/grub/menu.lst
+INST_FILES_644 = /etc/issue{en,hu} /etc/X11/xorg.conf /boot/grub/menu.lst
PWD = $(shell pwd)
PATCH_FILES = reboot.diff services.diff udev.diff rc.S.diff
REMOVE_FILES = /etc/rc.d/rcS.d/S{19rc.bootclean,07rc.frugalware} \
@@ -198,11 +198,11 @@ create-users: checkroot
sed "s|${FWLUSER}:\!:$$fwf|${FWLUSER}:$$fwpass:$$fwf|" -i
${CHROOTDIR}/${TREE}/etc/shadow; \
sed "s|root::$$rof|root:$$rootpass:$$rof|" -i ${CHROOTDIR}/${TREE}/etc/shadow; \
echo "${FWLUSER} ALL=(ALL) NOPASSWD:ALL" >${CHROOTDIR}/${TREE}/etc/sudoers; \
- sed "s|@VENDOR@|${VENDOR}|" -i ${CHROOTDIR}/${TREE}/etc/issue; \
- sed "s|@FWLREL@|$(shell ${FWLREL}) (${FWLCODENAME})|" -i
${CHROOTDIR}/${TREE}/etc/issue; \
- sed "s|username|${FWLUSER}|" -i ${CHROOTDIR}/${TREE}/etc/issue;
\
- sed "s|userpass|${FWUSERPASS}|" -i
${CHROOTDIR}/${TREE}/etc/issue; \
- sed "s|rootpass|${FWROOTPASS}|" -i
${CHROOTDIR}/${TREE}/etc/issue; \
+ sed "s|@VENDOR@|${VENDOR}|" -i
${CHROOTDIR}/${TREE}/etc/issue{en,hu}; \
+ sed "s|@FWLREL@|$(shell ${FWLREL}) (${FWLCODENAME})|" -i
${CHROOTDIR}/${TREE}/etc/issue{en,hu}; \
+ sed "s|username|${FWLUSER}|" -i
${CHROOTDIR}/${TREE}/etc/issue{en,hu}; \
+ sed "s|userpass|${FWUSERPASS}|" -i
${CHROOTDIR}/${TREE}/etc/issue{en,hu}; \
+ sed "s|rootpass|${FWROOTPASS}|" -i
${CHROOTDIR}/${TREE}/etc/issue{en,hu}; \
sed "s|SAVE_DIRS|${SAVEDIRS}|" -i
${CHROOTDIR}/${TREE}/usr/local/bin/configsave; \
fi
diff --git a/issue b/issue
deleted file mode 100644
index f8cc051..0000000
--- a/issue
+++ /dev/null
@@ -1,23 +0,0 @@
-[H[J
-[1;32m
=================================================================================================[0;39m
-[1;32m Welcome to FWLive @FWLREL@ by @VENDOR@ \l
[0;39m
-[1;32m
=================================================================================================[0;39m
-
- [1;29m The system is up and running now.[0;29m
-
- Login as "username", with password "userpass" or
- login as "root", with password "rootpass", both without quotes, lowercase.
-
- [1;29m After login, try the following commands:[0;29m
-
- mc ....... to start Midnight Commander (edit/copy/move/create/delete files)
- configsave/configrestore - or use - service config save/restore ...
- to save and restore all filesystem changes
- fileswap .... to create special file for swapping RAM to your harddisk
- make_disk ... to install FWLive, use make_disk script on FWLive CD
- xstart ... to start KDE with autodetected settings (upon failure vesa driver
- will be used) - or use the "setup" script for your own settings
-
-[1;32m When finished, use "poweroff" or "reboot" command and wait until it
completes [0;39m
-[1;32m
=================================================================================================[0;39m
-
diff --git a/parse_cmdline.in b/parse_cmdline.in
index 3eb88da..7bed853 100644
--- a/parse_cmdline.in
+++ b/parse_cmdline.in
@@ -16,6 +16,11 @@ fwlcp=$(grep $lang /usr/share/locale/locale.alias|sed
's/.*\.//;q'|tr [A-Z] [a-z
case $lang in
en_*)
keymap=us
+ ln -sf issue /etc/issue.en
+ ;;
+ hu_*)
+ keymap=`echo $lang |sed 's/_.*//'`
+ ln -sf issue /etc/issue.hu
;;
*)
keymap=`echo $lang |sed 's/_.*//'`
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644
index 66343bc..0000000
--- a/po/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-top_srcdir =
-PO_DIR=~/git/translations/po
-LANGS = $(shell ls $(PO_DIR)/fwlive)
-
-pos:
- [ -d $(PO_DIR) ]
- for i in $(LANGS); \
- do \
- cp $(PO_DIR)/fwlive/$$i/fwlive.po $$i.po; \
- if ! msgfmt -c --statistics -o $$i.gmo $$i.po; then \
- echo "WARNING: $$i.po will break your build!"; \
- fi; \
- done
-
-mos:
- for i in $(wildcard *.po); do \
- echo -n "$$i: "; \
- msgfmt -c --statistics -o
$(CHROOTDIR)/$(TREE)/usr/share/locale/`basename $$i .po`/LC_MESSAGES/fwlive.mo
$$i; \
- done
-
-pot: intltool-extract
- for i in `cat POTFILES.in`; do \
- ln -s `basename $$i .sh` ../$$i; \
- done
- intltool-update --pot --gettext-package=fwlive
- for i in `cat POTFILES.in`; do \
- rm ../$$i; \
- done
-
-intltool-extract:
- cp /usr/bin/intltool-extract ./
-
-update-po: pot
- for lang in $(LANGS); do \
- if msgmerge $$lang.po fwlive.pot -o $$lang.new.po; then \
- mv -f $$lang.new.po $$lang.po; \
- else \
- echo "msgmerge for $$cat failed!"; \
- rm -f $$lang.new.po; \
- fi; \
- done
-
-distclean:
- rm -f intltool-extract *.pot *.po *.gmo
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 9ac0e06..0000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,7 +0,0 @@
-configsave.sh
-fileswap.sh
-fpm2lzm.sh
-rc.config.sh
-rc.fsupd.sh
-rc.fwlive.sh
-rc.parse_cmdline.sh
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
