Author: uelsk8s
Date: Sat Nov 22 20:33:46 2008
New Revision: 318
Modified:
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlWinDrives.module
branches/iVL/installer.gambas
Log:
changed detection of windows updated installer
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Sat Nov 22 20:33:46 2008
@@ -30,7 +30,7 @@
msgid "Do not mount"
msgstr ""
-#: MdlWinDrives.module:186
+#: MdlWinDrives.module:190
msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sat Nov 22 20:33:46 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=FMain
-Version=0.1.5
+Version=0.1.6
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Sat Nov 22 20:33:46 2008
@@ -123,8 +123,9 @@
PRINT "mounting " & sWinAddr
'SHELL "mount " & "/dev" &/ sWinAddr & Space(1) & "/mnt" &/
sWinAddr WAIT
EXEC ["mount", "/dev" &/ sWinAddr, "/mnt" &/ sWinAddr] WAIT
- IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") OR IF IsDir("/mnt" &/ sWinAddr &/ "winnt") = TRUE
THEN 'Exist("/mnt" &/ sWinAddr &/ "winnt" &/ "system32" &/ "winver.exe")
THEN
+ 'IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") OR IF IsDir("/mnt" &/ sWinAddr &/ "winnt") = TRUE
THEN 'Exist("/mnt" &/ sWinAddr &/ "winnt" &/ "system32" &/ "winver.exe")
THEN
'IF IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
+ IF IsDir("/mnt" &/ sWinAddr &/ "windows") OR IF IsDir("/mnt"
&/ sWinAddr &/ "WINDOWS") OR IF IsDir("/mnt" &/ sWinAddr &/ "winnt") OR IF
IsDir("/mnt" &/ sWinAddr &/ "WINNT") = TRUE THEN
' this is indeed a windows installation
WITH FrmLilo.tsOsSetup
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Sat Nov 22 20:33:46 2008
@@ -143,7 +143,11 @@
ELSE
sBlank = " "
END IF
+ 'we need to know if this fails. it fails on a test machine
here with "bad partition table"
SHELL "export s=$(parted " & Left(wintfs[i], Len("/dev/hda"))
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'
\'" TO sPartsize
+ IF sPartSize.len = 0 THEN
+ sPartSize = "UNKNOWN"
+ ENDIF
tl = NEW TextLabel(FrmWinDrives.svWinDrives)
WITH tl
.y = y
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
