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

install/calculate

@@ -6645,22 +6645,24 @@ sub makepkg{
 # Соберем стабильную версию calculate
 #------------------------------------------------------------------------------
 sub makecalculate{
-	#Отмонтируем /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 '';
-	}
-	system "$data{path} rmdir $data{chroot}/usr/calculate/install";
-	printmes(" ".gettext('done').".\n");
-
-	#Установим calculate
-	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 '';
-	}else{
+	if(`mount | grep $data{chroot}/usr/calculate/install`){
+		#Отмонтируем /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 '';
+		}
+		system "$data{path} rmdir $data{chroot}/usr/calculate/install";
 		printmes(" ".gettext('done').".\n");
+
+		#Установим calculate
+		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 '';
+		}else{
+			printmes(" ".gettext('done').".\n");
+		}
 	}
 	return 1;
 }