From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 22 Sep 2008 07:19:58 +0000 From: Alexey Tourbin To: devel@lists.altlinux.org Message-ID: <20080922071958.GX32012@altlinux.org> Mail-Followup-To: devel@lists.altlinux.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="fzb4MfPSWK/5QThu" Content-Disposition: inline Subject: [devel] menu DURING_INSTALL X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.10b3 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2008 07:20:11 -0000 Archived-At: List-Archive: List-Post: --fzb4MfPSWK/5QThu Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =F7 =CB=C1=CB=C9=C8 =D3=CC=D5=DE=C1=D1=C8 =D0=D2=C9 =D5=D3=D4=C1=CE=CF=D7= =CB=C5 =D0=C1=CB=C5=D4=CF=D7 =D7=D9=D3=D4=C1=D7=CC=D1=C5=D4=D3=D1 DURING_IN= STALL? =F4=C1=CB=D6=C5 =D0=D2=CF=DB=D5 =D0=D2=CF=CB=CF=CD=CD=C5=CE=D4=C9=D2=CF=D7= =C1=D4=D8 =D0=CF=D3=CC=C5=C4=CE=C5=C5 =C9=DA=CD=C5=CE=C5=CE=C9=C5 =D7 =D0= =C1=CB=C5=D4=C5 menu. =F0=CF=DE=C5=CD=D5 =C9=CE=C9=C3=C9=C1=CC=C9=DA=C9=D2=CF=D7=C1=D4=D8 =CD=C5= =CE=C0 =CE=C1=C4=CF =CE=C5 =D7 %post-=D3=CB=D2=C9=D0=D4=C5, =C1 =D0=D2=C9 = =D0=C5=D2=D7=CF=CA =DA=C1=C7=D2=D5=DA=CB=C5? commit e5c0c5f30d097ef18c3c619a51c3cc962742a58c Author: Anton Farygin Date: Wed Jun 25 13:07:15 2008 +0400 2.1.35-alt5.1 =20 - create /etc/menu-methods/lang.h in firsttime script, also don't run p= ost script on system preparing stage (check DURING_INSTALL) diff --git a/menu-firsttime b/menu-firsttime index 1e8dac3..a677d90 100755 --- a/menu-firsttime +++ b/menu-firsttime @@ -5,4 +5,23 @@ WITHOUT_RC_COMPAT=3D1 # Source function library. . /etc/init.d/functions =20 +# create languages list +if [ -r /etc/sysconfig/i18n ]; then + . /etc/sysconfig/i18n +fi +PREFERRED_LOCALE=3D$LANG +[ -n "$PREFERRED_LOCALE" ] || PREFERRED_LOCALE=3DC + +LANGUAGES_LIST=3D$SUPPORTED +[ -n "$LANGUAGES_LIST" ] || LANGUAGES_LIST=3D$PREFERRED_LOCALE +[ -n "$LANGUAGES_LIST" ] || LANGUAGES_LIST=3DC + +if [ "$LANGUAGE" =3D=3D "all" ] +then + LANGUAGES_LIST=3D`echo /usr/share/locale/*/LC_MESSAGES/menu-messages.m= o | sed -e 's@/usr/share/locale/@@g' -e 's@/LC_MESSAGES/menu-messages.mo@@g= ' -e 's@ @:@g'` +fi +echo "function lang()=3D\"$PREFERRED_LOCALE\"" > /etc//menu-methods/lang.h +echo "function languages()=3D\"$LANGUAGES_LIST\"" >> /etc/menu-methods/lan= g.h + + action "Updating application menus:" /usr/bin/update-menus diff --git a/menu.spec b/menu.spec index c74e1c4..fc4c777 100644 --- a/menu.spec +++ b/menu.spec @@ -3,7 +3,7 @@ =20 Name: menu Version: 2.1.35 -Release: alt5 +Release: alt5.1 =20 Group: System/Base Summary: Menu system @@ -153,6 +153,8 @@ mkdir -p %buildroot/%_sysconfdir/xdg/menus/ =20 %post # create languages list +[ -z "$DURING_INSTALL" ] || exit 0 + if [ -r %_sysconfdir/sysconfig/i18n ]; then . %_sysconfdir/sysconfig/i18n fi @@ -204,6 +206,10 @@ fi %doc doc/{*html,README*,BUGS,menu.txt*} AUTHORS debian/changelog debian/co= pyright examples =20 %changelog +* Wed Jun 25 2008 Anton Farygin 2.1.35-alt5.1 +- create /etc/menu-methods/lang.h in firsttime script, also don't run post= =20 + script on system preparing stage (check DURING_INSTALL) + * Tue Oct 23 2007 Sergey V Turchin 2.1.35-alt5 - improve desktop categories translation file =20 --fzb4MfPSWK/5QThu Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkjXRx4ACgkQfBKgtDjnu0ZZ1ACfR5TDxLfW/BHo5XGGdMPx5bHT 668An1NZhTkq8sjfv1VWJP0jjX19+uA1 =QOF1 -----END PGP SIGNATURE----- --fzb4MfPSWK/5QThu--