From: <cod...@go...> - 2008-07-20 05:57:03
|
Author: M0...@gm... Date: Sat Jul 19 22:56:35 2008 New Revision: 59 Modified: branches/iVL/.project branches/iVL/MdlCore.module branches/iVL/MdlPartSel.module branches/iVL/MdlSetup.module branches/iVL/installer.gambas Log: updated binary Modified: branches/iVL/.project ============================================================================== --- branches/iVL/.project (original) +++ branches/iVL/.project Sat Jul 19 22:56:35 2008 @@ -1,7 +1,7 @@ # Gambas Project File 2.0 Title=VectorLinux Installer Startup=MdlCore -Version=0.0.17 +Version=0.0.18 Library=gb.gtk Library=gb.form Library=gb.debug Modified: branches/iVL/MdlCore.module ============================================================================== --- branches/iVL/MdlCore.module (original) +++ branches/iVL/MdlCore.module Sat Jul 19 22:56:35 2008 @@ -90,7 +90,7 @@ DIM sPartition AS String 'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \' \'" TO sResults - SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \'" TO sResults + SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \' | grep -e \" /dev\"" TO sResults sResults = Trim(sResults) 'Message.Info(sResults) IF InStr(sResults, gb.NewLine) THEN Modified: branches/iVL/MdlPartSel.module ============================================================================== --- branches/iVL/MdlPartSel.module (original) +++ branches/iVL/MdlPartSel.module Sat Jul 19 22:56:35 2008 @@ -42,7 +42,7 @@ ' We will mount the partitions first, and then figure out their size - SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \'" TO sDump1 + SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' | grep /dev" TO sDump1 sDump1 = Trim(sDump1) @@ -139,7 +139,7 @@ END IF - SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \'" TO sSwapList + SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \' | grep -e /dev" TO sSwapList sSwapList = Trim(sSwapList) 'Message.Info(sSwapList) IF InStr(sSwapList, gb.NewLine) THEN Modified: branches/iVL/MdlSetup.module ============================================================================== --- branches/iVL/MdlSetup.module (original) +++ branches/iVL/MdlSetup.module Sat Jul 19 22:56:35 2008 @@ -54,8 +54,8 @@ DIM sFATList AS String DIM sFAT32List AS String - SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" TO sFAT32List - SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" TO sFATList + SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\' | grep -e \"/dev\"" TO sFAT32List + SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'|grep -e \" /dev\"" TO sFATList sFAT32List = Trim(sFAT32List) sFATList = Trim(sFATList) Modified: branches/iVL/installer.gambas ============================================================================== Binary files. No diff available. |