Author: M0E.lnx
Date: Fri Nov 21 10:30:58 2008
New Revision: 314
Modified:
branches/iVL/.project
branches/iVL/FrmUserAdd.class
branches/iVL/MdlLilo.module
branches/iVL/MdlLiloOsList.module
branches/iVL/installer.gambas
Log:
Added code to improve OS detection
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Nov 21 10:30:58 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmUserAdd
Version=0.1.2
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Fri Nov 21 10:30:58 2008
@@ -28,10 +28,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- .FrmCurr = ME
- .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- .tvPlan["Conf3"].picture = MdlCore.sNowPic
- .tvPlan["Conf3"].Selected = TRUE
+ ' .FrmCurr = ME
+ ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -58,6 +58,7 @@
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
FMain.btnext.Enabled = TRUE
+ ME.tbUsername.SetFocus
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Fri Nov 21 10:30:58 2008
@@ -396,7 +396,7 @@
EXEC ["umount", sPartition] WAIT
EXEC ["mount", sPartition, sTmpMountPoint] WAIT
END IF
- IF Exist(sTmpMountPoint &/ "winnt" &/ "system32"
&/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32"
&/ "winver.exe") THEN
+ IF Exist(sTmpMountPoint &/ "winnt" &/ "system32"
&/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32"
&/ "winver.exe") OR IF IsDir(sTmpMountPoint &/ "winnt") THEN
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
.Index = .Count - 1
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Nov 21 10:30:58 2008
@@ -557,7 +557,13 @@
ELSE IF Exist(sBasePath &/ "gentoo-release") THEN
sDesc = "Gentoo"
ELSE IF Exist(sBasePath &/ "debian_version") THEN
- sDesc = "Debian"
+ SHELL "grep -m 1 cdrom " & sBasePath &/ "apt" &/ "sources.list |
cut -d \"[\" -f1 | cut -d \" \" -f 1,2" TO sDesc
+ sDesc = Trim(sDesc)
+ IF sDesc <> ""
+ sDesc = Replace(sDesc, " ", "_")
+ ELSE
+ sDesc = "Debian"
+ END IF
ELSE IF Exist(sBasePath &/ "mandrake-release") THEN
sDesc = "Makdrake"
ELSE IF Exist(sBasePath &/ "redhat-release") THEN
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
