Add support install CL 10.4 beta

Change.log

@@ -7,6 +7,7 @@ CHANGE LOG
 * Fix ejecting for liveCD boot in mode "docache".
 * Add guest autologin to liveCD of CLDG.
 * Add setting for mounting of the ntfs file system by nautilus.
+* Add support install CL 10.4 beta.
 
 1.3.9
 * Add change partition id for system installation.

install/calculate

@@ -849,14 +849,12 @@ sub welcome{
 		CDS => "Calculate Directory Server",
 		CLS => "Calculate Linux Scratch",
 		CLSG => "Calculate Linux Scratch",
-		CLSK => "Calculate Linux Scratch",
 	);
 	%{$data{ver_desktop}} = (
 		CLD => "KDE",
 		CLDG => "GNOME",
 		CLDX => "XFCE",
 		CLSG => "GNOME",
-		CLSK => "KDE",
 	);
 
 	#если передан параметр выбора системы, установим значения
@@ -891,7 +889,7 @@ sub welcome{
 	if($data{'calculate'}=~m/^CLD/){
 		@{$data{other}}{'calculatesubname'} = ["KDE", "XFCE"];
 		$data{'calculatesubname'} = $data{ver_desktop}{$data{calculate}};
-	}elsif($data{'calculate'}=~m/CLSG/ || $data{'calculate'}=~m/CLSK/){
+	}elsif($data{'calculate'}=~m/CLSG/){
 		$data{'calculatesubname'} = $data{ver_desktop}{$data{calculate}};
 	}
 
@@ -1200,7 +1198,7 @@ sub checksystem{
 					$data{netconf} .= "\nconfig_$dev=( \"$addr$net{$mask}\" )";
 				}
 				$dev_open = 1;
-				if($data{calculate} ne "CLS" && $data{calculate} ne "CLSG" && $data{calculate} ne "CLSK"){
+				if($data{calculate} ne "CLS" && $data{calculate} ne "CLSG"){
 					$data{netconf} .= "\nmodules_eth0=( \"!plug\" )";
 				}
 		}	}
@@ -2968,19 +2966,17 @@ sub checkready{
 	if(!$data{builder}){
 		if(
 			(($data{calculate} eq "CLD" &&
-				number_ver($data{linuxver}) > number_ver('10.2.9')) ||
+				number_ver($data{linuxver}) > number_ver('10.3.99')) ||
 			($data{calculate} eq "CLDG" &&
-				number_ver($data{linuxver}) > number_ver('10.0.9')) ||
+				number_ver($data{linuxver}) > number_ver('10.3.99')) ||
 			($data{calculate} eq "CLDX" &&
-				number_ver($data{linuxver}) > number_ver('10.2.9')) ||
+				number_ver($data{linuxver}) > number_ver('10.3.99')) ||
 			($data{calculate} eq "CLS" &&
-				number_ver($data{linuxver}) > number_ver('10.2.9')) ||
+				number_ver($data{linuxver}) > number_ver('10.3.99')) ||
 			($data{calculate} eq "CLSG" &&
 				number_ver($data{linuxver}) > number_ver('10.0.9')) ||
-			($data{calculate} eq "CLSK" &&
-				number_ver($data{linuxver}) > number_ver('10.0.9')) ||
 			($data{calculate} eq "CDS" &&
-				number_ver($data{linuxver}) > number_ver('10.2.9'))
+				number_ver($data{linuxver}) > number_ver('10.3.99'))
 			) && !defined $data{arg}{'force'}
 		){
 			printmes("\n".gettext('To install the system update program Calculate. Launch "layman -S && emerge calculate"')); printmes(".\n");
@@ -6942,7 +6938,7 @@ sub beep{
 # Соберем бинарные пакеты дополнений (nVideo драйвера)
 #------------------------------------------------------------------------------
 sub makepkg{
-	if($data{system} eq "server" || $data{calculate} eq "CLS" || $data{calculate} eq "CLSG" || $data{calculate} eq "CLSK"){return 1;}
+	if($data{system} eq "server" || $data{calculate} eq "CLS" || $data{calculate} eq "CLSG"){return 1;}
 
 	printmes(gettext('Make nvidia drivers')."\n");