Cleanups

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

2 files changed, 28 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31dffd2d24fb..73e5b00d35d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov  2 13:46:54 UTC 2016
+# Wed Nov  2 13:54:47 UTC 2016
 pkgbase = scaleio
 	pkgdesc = ScaleIO
 	pkgver = 2.0.0.2
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.emc.com/storage/scaleio/
 	arch = x86_64
 	license = Custom
diff --git a/PKGBUILD b/PKGBUILD
index 9562d2a950c8..b0029722b724 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=( 'scaleio-gui' 'scaleio-tb'
           'scaleio-sdc' 'scaleio-sds'
           'scaleio-mdm' 'scaleio-callhome' )
 pkgver=2.0.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="ScaleIO"
 arch=('x86_64')
 url="http://www.emc.com/storage/scaleio/"
@@ -18,9 +18,7 @@ source=("http://downloads.emc.com/emc-com/usa/ScaleIO/ScaleIO_Linux_v2.0.zip")
 
 md5sums=('b681b39f46bcff125522d2c2b819b32f')
 
-extract_deb(){
-    ar xv $1
-}
+extract_deb(){ ar xv "$1"; }
 
 prepare() {
         cd $srcdir/ScaleIO_${pkgver}_Complete_Linux_SW_Download
@@ -64,24 +62,28 @@ package_scaleio-gui()
         tar xf data.tar.gz
         mv opt ${pkgdir}/opt
 
-        rm -rf ../scaleio-gui
-
         mkdir -p ${pkgdir}/usr/bin/
-        echo '#!/bin/bash'                 >  ${pkgdir}/usr/bin/scaleio-gui
-        echo '/opt/emc/scaleio/gui/run.sh' >> ${pkgdir}/usr/bin/scaleio-gui
+
+        {
+            echo '#!/bin/bash'
+            echo '/opt/emc/scaleio/gui/run.sh'
+        } >  ${pkgdir}/usr/bin/scaleio-gui
         chmod +x ${pkgdir}/usr/bin/scaleio-gui
 
         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
+
+        mkdir -p ${pkgdir}/usr/share/applications/
+        {
+            echo "[Desktop Entry]"
+            echo Name=ScaleIO GUI
+            echo Comment=ScaleIO GUI client
+            echo Exec=/usr/bin/scaleio-gui
+            echo Icon=scaleio
+            echo Terminal=false
+            echo Type=Application
+            echo StartupNotify=true
+        } >  ${pkgdir}/usr/share/applications/scaleio-gui.desktop
 }
 
 package_scaleio-gateway()
@@ -92,18 +94,7 @@ package_scaleio-gateway()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-gateway
-        cd ./scaleio-gateway
-        mv ../EMC-ScaleIO-gateway-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-
-        for i in ../*csv; do
-                mv $i ./opt/emc/scaleio/gateway/conf/
-        done
-        rsync -a ./ ${pkgdir}/
-        rm -rf ../scaleio-gateway
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }
 
 package_scaleio-callhome()
@@ -114,14 +105,7 @@ package_scaleio-callhome()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-callhome
-        cd ./scaleio-callhome
-        mv ../EMC-ScaleIO-callhome-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
-        rm -rf ../scaleio-callhome
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }
 
 package_scaleio-lia()
@@ -132,14 +116,7 @@ package_scaleio-lia()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-lia
-        cd ./scaleio-lia
-        mv ../EMC-ScaleIO-lia-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
-        rm -rf ../scaleio-lia
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }
 
 package_scaleio-tb()
@@ -150,14 +127,7 @@ package_scaleio-tb()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-tb
-        cd ./scaleio-tb
-        mv ../EMC-ScaleIO-tb-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
-        rm -rf ../scaleio-tb
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }
 
 package_scaleio-sdc()
@@ -168,19 +138,7 @@ package_scaleio-sdc()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-sdc
-        cd ./scaleio-sdc
-        mv ../EMC-ScaleIO-sdc-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
-	mkdir ${pkgdir}/usr/
-	mv ${pkgdir}/bin ${pkgdir}/usr/
-	chmod -R 755 ${pkgdir}/
-	mv ${pkgdir}/etc/init.d/scini ${pkgdir}/usr/bin/
-	rm -rf ${pkgdir}/etc/init.d
-        rm -rf ../scaleio-sdc
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }
 
 package_scaleio-sds()
@@ -191,14 +149,7 @@ package_scaleio-sds()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-sds
-        cd ./scaleio-sds
-        mv ../EMC-ScaleIO-sds-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
-        rm -rf ../scaleio-sds
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }
 
 package_scaleio-mdm()
@@ -209,12 +160,5 @@ package_scaleio-mdm()
         conflicts=()
         options=('!emptydirs' '!strip')
 
-        cd ${srcdir}
-        mkdir -p scaleio-mdm
-        cd ./scaleio-mdm
-        mv ../EMC-ScaleIO-mdm-*.rpm ./
-        rpmextract.sh ./*rpm
-        rm ./*rpm
-        rsync -a ./ ${pkgdir}/
-        rm -rf ../scaleio-mdm
+        cd ${srcdir}/ScaleIO_${pkgver}_Complete_Linux_SW_Download/
 }