git-svn-id: http://svn.calculate.ru/calculate/trunk@1715 c91db197-33c1-4113-bf15-f8a5c547ca64

install/calculate

@@ -1491,7 +1491,7 @@ sub checksystem{
 	#----------------------------------------------------------------------
 	# Определим размер RAM диска для ISO образа при загрузке с docahe
 	#----------------------------------------------------------------------
-	if($data{builder} && $data{linux}){
+	if(defined $data{arg}{iso} && $data{linux}){
 		if($data{linux} ne "livecd"){
 			$data{docache} = `du -b /usr/calculate/share/linux/$data{linux}`;
 			$data{docache} =~s/^([0-9])\s.+/$1/;
@@ -3652,23 +3652,6 @@ sub configure{
 		printmes(" ".gettext('done').".\n");
 	}
 
-	#Отмонтируем /usr/calculate/install
-	printmes("  ".gettext('Umount')); printmes(" /usr/calculate/install...");
-	if(system "$data{path} umount $data{chroot}/usr/calculate/install &>/dev/null"){
-		printmes(" ".gettext('error')."!\n");
-		umountbuild(); return '';
-	}
-	printmes(" ".gettext('done').".\n");
-
-	#Установим calculate
-	printmes("  ".gettext('Install the calculate')); printmes("...");
-	if(system "$data{path} chroot $data{chroot} emerge sys-apps/calculate &>/dev/null"){
-		printmes(" ".gettext('error')."!\n");
-		umountbuild(); return '';
-	}else{
-		printmes(" ".gettext('done').".\n");
-	}
-
 	#chroot emerge sys-kernel/calculate-sources
 	printmes("  ".gettext('Install the kernel')); printmes("...");
 	if(system "$data{emergerun1} sys-kernel/calculate-sources $data{emergerun2} &>/dev/null"){
@@ -6384,11 +6367,16 @@ sub makepkg{
 # Соберем стабильную версию calculate
 #------------------------------------------------------------------------------
 sub makecalculate{
-	#удалим маски
-	system "$data{path} rm -f $data{chroot}/etc/portage/package.keywords/calculate";
-	system "$data{path} rm -f $data{chroot}/etc/portage/package.unmask/calculate";
+	#Отмонтируем /usr/calculate/install
+	printmes("  ".gettext('Umount')); printmes(" /usr/calculate/install...");
+	if(system "$data{path} umount $data{chroot}/usr/calculate/install &>/dev/null"){
+		printmes(" ".gettext('error')."!\n");
+		return '';
+	}
+	printmes(" ".gettext('done').".\n");
+
 	#Установим calculate
-	printmes("  ".gettext('Install the calculate')); printmes("...");
+	printmes("  ".gettext('Execute')); printmes(" emerge sys-apps/calculate...");
 	if(system "$data{path} chroot $data{chroot} emerge sys-apps/calculate &>/dev/null"){
 		printmes(" ".gettext('error')."!\n");
 		return '';

install/i18n/ru_RU/LC_MESSAGES/calculate.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: support.ru\n"
-"POT-Creation-Date: 2009-06-11 00:16+0400\n"
+"POT-Creation-Date: 2009-06-11 09:58+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -330,9 +330,6 @@ msgstr "Введите пароль пользователя guest в новом
 msgid "Input user password root to new distributive file"
 msgstr "Укажите пароль пользователя root для нового дистрибутива"
 
-msgid "Install the calculate"
-msgstr ""
-
 msgid "Install the kernel"
 msgstr "Установим ядро"