Again try to fix Drives detect uuid, mount point, mount width

i-nex · Feb 14, 2012 · 8a1f20a · 8a1f20a
1 parent bb0662c
commit 8a1f20a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/i-nex/.settings b/src/i-nex/.settings
@@ -16,14 +16,14 @@ SearchString=True
 
 [OpenFile]
 File[1]=".src/Finfosys.form"
-File[2]=".src/Finfosys.class:545.1"
+File[2]=".src/Finfosys.class:493.3"
 File[3]=".src/Global.class:127.23"
 File[4]=".src/About.form"
 File[5]=".src/About.class:63.30"
 File[6]=".src/distrodetect.class:12.30"
 File[7]=".src/battery.module:24.17"
 Active=8
-File[8]=".src/Disk_Drives.module:130.0"
+File[8]=".src/Disk_Drives.module:146.23"
 File[9]=".src/ScreenShot.form"
 File[10]=".src/ScreenShot.class:19.19"
 File[11]=".src/ScreenShotM.module:2.21"

diff --git a/src/i-nex/.src/Disk_Drives.module b/src/i-nex/.src/Disk_Drives.module
@@ -90,9 +90,8 @@ Public Sub get_informations()
   Shell "df | grep '" & Finfosys.ComboBox3.Text & "' | awk {'print $5'} | sed -n '1p'" Wait To used
   Debug "Get informations of Drives Done" 
   Debug "Replace new line to Null"
-  disks()
   rm_new_line()
-
+  disks()
 End
 
 Public Sub rm_new_line()
@@ -133,8 +132,18 @@ Public Sub disks()
   Shell "grep '" & Finfosys.ComboBox3.Text & "' /proc/mounts | awk {'print $4'}" Wait To mount_widtch
   Shell "df | grep '" & Finfosys.ComboBox3.Text & "' | awk {'print $6'} | sed -n '1p'" Wait To mount_point
   Shell "ls -l /dev/disk/by-uuid/ | grep " & Finfosys.ComboBox3.Text & " | awk {'print $8'}" Wait To device_uuid
+  device_uuid = Replace(Replace(device_uuid, " ", ""), "\n", "")
   Shell "grep '" & Finfosys.ComboBox3.Text & "' /proc/mounts | awk {'print $3'}" Wait To filesystem_type
-  If mount_widtch = Null And device_uuid Not Null Then
+  filesystem_type = Replace(Replace(filesystem_type, " ", ""), "\n", "")
+  If mount_widtch = Null Then
   Shell "grep '" & device_uuid & "' /proc/mounts | awk {'print $4'}" Wait To mount_widtch
   Endif
+  mount_widtch = Replace(mount_widtch, "\n", "")
+  If filesystem_type = Null Then
+  Shell "grep '" & device_uuid & "' /proc/mounts | awk {'print $3'}" Wait To filesystem_type
+  Endif
+  filesystem_type = Replace(Replace(filesystem_type, " ", ""), "\n", "")
+  If device_uuid = Null Then
+  filesystem_type = Null
+  Endif
 End
diff --git a/src/i-nex/.src/Finfosys.class b/src/i-nex/.src/Finfosys.class
@@ -497,7 +497,7 @@ Public Sub ComboBox4_Click()
 
  Disk_Drives._init_2()
  Disk_Drives.get_informations()
- Finfosys.refreshing()
+ refreshing()
 End
 
 Public Sub refreshing()