From 1cbf9e0c52fb98fd9eed2c03982ec5b9bc0ad9a0 Mon Sep 17 00:00:00 2001
From: albertogp <albertogp@uma.es>
Date: Wed, 28 May 2014 11:02:44 +0000
Subject: #541 Integrando cambios en version 1.0 Cambios en ficheros Cache.lib,
 Disk.lib, FileSystem.lib, Image.lib

git-svn-id: https://opengnsys.es/svn/branches/version1.0@4288 a21b9725-9963-47de-94b9-378ad31fedc9
---
 client/engine/Image.lib | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'client/engine/Image.lib')

diff --git a/client/engine/Image.lib b/client/engine/Image.lib
index c9c09e5e..f66ab900 100755
--- a/client/engine/Image.lib
+++ b/client/engine/Image.lib
@@ -677,8 +677,19 @@ then
 	then
 		TOOLS=PARTCLONE
 		FS=$(echo $PARTCLONEINFO | awk '{gsub(/\: /,"\n"); print toupper($8);}')
-		echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024
-		SIZE=$(echo $PARTCLONEINFO | awk -v FACTOR=$SIZEFACTOR '{gsub(/\: /,"\n"); printf "%d\n", $11*FACTOR;}')
+		if [ "$FS" == "HFS" || "$FS" == "HFSPLUS" || "$FS" == "FAT32" ]; then
+			FSPLUS=$(echo $PARTCLONEINFO | awk '{gsub(/\: /,"\n"); print toupper($9);}')
+			echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024
+			if [ "$FSPLUS" -eq "PLUS" ]; then
+				FS=$FS$FSPLUS
+				SIZE=$(echo $PARTCLONEINFO | awk -v FACTOR=$SIZEFACTOR '{printf "%d\n", $17*FACTOR;}')
+			else
+				SIZE=$(echo $PARTCLONEINFO | awk -v FACTOR=$SIZEFACTOR '{printf "%d\n", $16*FACTOR;}')
+			fi
+		else
+			echo $PARTCLONEINFO | grep GB > /dev/null && SIZEFACTOR=1000000 || SIZEFACTOR=1024
+			SIZE=$(echo $PARTCLONEINFO | awk -v FACTOR=$SIZEFACTOR '{gsub(/\: /,"\n"); printf "%d\n", $11*FACTOR;}')
+		fi
 		IMGDETECT="TRUE"
 	fi
 fi
-- 
cgit v1.2.3-18-g5258