Gui working at now

Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>

4 files changed, 49 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 825a8adad91f..31dffd2d24fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Wed Nov  2 13:03:13 UTC 2016
+# Wed Nov  2 13:46:54 UTC 2016
 pkgbase = scaleio
 	pkgdesc = ScaleIO
 	pkgver = 2.0.0.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.emc.com/storage/scaleio/
-	install = scaleio-gui.install
 	arch = x86_64
 	license = Custom
 	makedepends = unzip
@@ -17,7 +16,7 @@ pkgbase = scaleio
 	options = !strip
 	options = !emptydirs
 	source = http://downloads.emc.com/emc-com/usa/ScaleIO/ScaleIO_Linux_v2.0.zip
-	sha256sums = SKIP
+	md5sums = b681b39f46bcff125522d2c2b819b32f
 
 pkgname = scaleio-gui
 	pkgdesc = ScaleIO GUI
@@ -27,8 +26,8 @@ pkgname = scaleio-gui
 	options = !emptydirs
 	options = !strip
 
-pkgname = scaleio-gateway
-	pkgdesc = ScaleIO Gateway
+pkgname = scaleio-tb
+	pkgdesc = ScaleIO tb
 	depends = 
 	provides = 
 	conflicts = 
@@ -67,19 +66,3 @@ pkgname = scaleio-callhome
 	options = !emptydirs
 	options = !strip
 
-pkgname = scaleio-lia
-	pkgdesc = ScaleIO callhome
-	depends = 
-	provides = 
-	conflicts = 
-	options = !emptydirs
-	options = !strip
-
-pkgname = scaleio-tb
-	pkgdesc = ScaleIO tb
-	depends = 
-	provides = 
-	conflicts = 
-	options = !emptydirs
-	options = !strip
-
diff --git a/PKGBUILD b/PKGBUILD
index 35a8bf82f4e8..9562d2a950c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Timofey Titovets <nefelim4ag@gmail.com>
 
 pkgbase=scaleio
-pkgname=( 'scaleio-gui' 'scaleio-gateway'
+pkgname=( 'scaleio-gui' 'scaleio-tb'
           'scaleio-sdc' 'scaleio-sds'
-          'scaleio-mdm' 'scaleio-callhome'
-          'scaleio-lia' 'scaleio-tb')
+          'scaleio-mdm' 'scaleio-callhome' )
 pkgver=2.0.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="ScaleIO"
 arch=('x86_64')
 url="http://www.emc.com/storage/scaleio/"
@@ -15,34 +14,39 @@ depends=('libaio' 'numactl' 'mutt' 'bash-completion' 'python2')
 makedepends=('unzip')
 conflicts=()
 options=('!strip' '!emptydirs')
-install=$pkgname.install
 source=("http://downloads.emc.com/emc-com/usa/ScaleIO/ScaleIO_Linux_v2.0.zip")
 
-sha256sums=('SKIP')
+md5sums=('b681b39f46bcff125522d2c2b819b32f')
 
 extract_deb(){
     ar xv $1
 }
 
 prepare() {
-        cd $srcdir
-        rm -rf ./ScaleIO_*_XEN_*_Download
-        rm -rf ./ScaleIO_*_SLES_*_Download
-        rm -rf ./ScaleIO_*_OpenStack_*_Download
-        rm -rf ./ScaleIO_*_RHEL6_Download
-        rm -rf ./ScaleIO_*_GPG-RPM-KEY_Download
-        rm -rf ./ScaleIO_*Windows*_Download
-        mv ./ScaleIO_${pkgver}_Gateway_for_Linux_Download/EMC-ScaleIO-gateway-*.noarch.rpm ./
-        for i in ./ScaleIO_${pkgver}_Gateway_for_Linux_Download/*csv; do
-                mv $i ./
-        done
+        cd $srcdir/ScaleIO_${pkgver}_Complete_Linux_SW_Download
+        echo "Clean up"
+        echo "Remove GPG-RPM-KEY"
+        rm -rf ./ScaleIO_${pkgver}_GPG-RPM-KEY_Download
+        echo "Remove RHEL stuff"
+        rm -rf ./ScaleIO_${pkgver}_RHEL6_Download
+        rm -rf ./ScaleIO_${pkgver}_RHEL7_Download
+        echo "Remove XEN stuff"
+        rm -rf ./ScaleIO_${pkgver}_XEN_6.5_Download
+        echo "Remove SLES stuff"
+        rm -rf ./ScaleIO_${pkgver}_SLES_11.3_Download
+        rm -rf ./ScaleIO_${pkgver}_SLES_12.0_Download
+        rm -rf ./ScaleIO_${pkgver}_SLES_12.1_Download
+        echo "Remove OpenStack stuff"
+        rm -rf ./ScaleIO_${pkgver}_OpenStack_Driver_Download
+        echo "Remove Windows stuff"
+        rm -rf ./ScaleIO_${pkgver}_Gateway_for_Windows_Download
+        rm -rf ./ScaleIO_${pkgver}_GUI_for_Windows_Download
+        echo "Remove PDFs"
+        rm ./*.pdf
+        echo "Remove Gateway for Linux"
         rm -rf ./ScaleIO_${pkgver}_Gateway_for_Linux_Download
-        mv ./ScaleIO_1.32.2_GUI_for_Linux_Download/*rpm ./
-        rm -rf ./ScaleIO_1.32.2_GUI_for_Linux_Download/
-        for i in ./ScaleIO_1.32.2_RHEL7_Download/*.rpm; do
-                mv $i ./
-        done
-        rm -rf ./ScaleIO_1.32.2_RHEL7_Download/
+        mv ./ScaleIO_${pkgver}_GUI_for_Linux_Download ./GUI
+        mv ./ScaleIO_${pkgver}_UBUNTU_14.04_Download  ./U1404P
 }
 
 package_scaleio-gui()
@@ -53,13 +57,12 @@ package_scaleio-gui()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-gui
-        cd ./scaleio-gui
-        mv ../EMC-ScaleIO-gui-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/GUI
+        rm EMC-ScaleIO-gui-2.0-7120.0.noarch.rpm
+        extract_deb EMC-ScaleIO-gui-2.0-7120.0.deb
+        rm EMC-ScaleIO-gui-2.0-7120.0.deb control.tar.gz debian-binary
+        tar xf data.tar.gz
+        mv opt ${pkgdir}/opt
 
         rm -rf ../scaleio-gui
 
@@ -68,8 +71,17 @@ package_scaleio-gui()
         echo '/opt/emc/scaleio/gui/run.sh' >> ${pkgdir}/usr/bin/scaleio-gui
         chmod +x ${pkgdir}/usr/bin/scaleio-gui
 
-        install -Dm 755 ${srcdir}/../scaleio.png ${pkgdir}/usr/share/icons/scaleio.png
-        install -Dm 755 ${srcdir}/../scaleio-gui.desktop ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        mkdir -p ${pkgdir}/usr/share/icons/
+        mkdir -p ${pkgdir}/usr/share/applications/
+        [ -f ${srcdir}/../scaleio.png ] && install -Dm 644 ${srcdir}/../scaleio.png ${pkgdir}/usr/share/icons/scaleio.png
+        echo "[Desktop Entry]"          >  ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo Name=ScaleIO GUI           >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo Comment=ScaleIO GUI client >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo Exec=/usr/bin/scaleio-gui  >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo Icon=scaleio               >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo Terminal=false             >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo Type=Application           >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
+        echo StartupNotify=true         >> ${pkgdir}/usr/share/applications/scaleio-gui.desktop
 }
 
 package_scaleio-gateway()
diff --git a/scaleio-gui.desktop b/scaleio-gui.desktop
deleted file mode 100644
index 2e8cca68c895..000000000000
--- a/scaleio-gui.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=ScaleIO GUI
-Comment=ScaleIO GUI client
-Exec=/usr/bin/scaleio-gui
-Icon=scaleio
-Terminal=false
-Type=Application
-StartupNotify=true
diff --git a/scaleio-gui.install b/scaleio-gui.install
deleted file mode 100644
index aafbe7312ef7..000000000000
--- a/scaleio-gui.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-        echo
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  post_install "$1"
-}