cleanup

3 files changed, 26 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02a397067722..3e5ac612f0f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 pkgbase = leanote
 	pkgdesc = Knowledge, Blog, Sharing, Cooperation.
 	pkgver = 2.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://leanote.com/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = electron
 	makedepends = gulp
+	makedepends = libarchive
 	depends = electron
 	depends = gconf
 	provides = leanote
 	conflicts = leanote
+	noextract = leanote-2.3.zip
 	source = leanote.desktop
 	source = leanote
 	sha256sums = 8dab30fe0835432e44b5a3a1d46aebde8716a2a47ba4031cbe2a01560987aa83
 	sha256sums = 57155a0e423bc98f0e83acb35f03ace06b3de54bdc64b2373128671c801727b1
-	source_i686 = https://sourceforge.net/projects/leanote-desktop-app/files/2.3/leanote-desktop-linux-ia32-v2.3.zip/download
+	source_i686 = leanote-2.3.zip::https://sourceforge.net/projects/leanote-desktop-app/files/2.3/leanote-desktop-linux-ia32-v2.3.zip/download
 	sha256sums_i686 = f65a0c58f6ac77f71c522647f9acffee8790c466d3c5bb8246daceee2c657b51
-	source_x86_64 = https://sourceforge.net/projects/leanote-desktop-app/files/2.3/leanote-desktop-linux-x64-v2.3.zip/download
+	source_x86_64 = leanote-2.3.zip::https://sourceforge.net/projects/leanote-desktop-app/files/2.3/leanote-desktop-linux-x64-v2.3.zip/download
 	sha256sums_x86_64 = 2d83504ed1537ff5263dda3056c2c57513e941ca0fb7900823c9c4a137f39983
 
 pkgname = leanote
diff --git a/.gitignore b/.gitignore
index 70e946d67b5c..69b09fda1ce8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.xz
+*.zip
 *.gz
 src/
 pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 67b68749487c..6c1db9490bcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 _pkgname=desktop-app
 pkgname=leanote
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Knowledge, Blog, Sharing, Cooperation."
 arch=("i686" "x86_64")
 url="https://leanote.com/"
 license=("GPL3")
 depends=("electron" "gconf")
-makedepends=("electron" "gulp")
+makedepends=("electron" "gulp" "libarchive")
 provides=("${pkgname}")
 conflicts=("${pkgname}")
 #install=$pkgname.install
@@ -21,13 +21,20 @@ sha256sums=('8dab30fe0835432e44b5a3a1d46aebde8716a2a47ba4031cbe2a01560987aa83'
 '57155a0e423bc98f0e83acb35f03ace06b3de54bdc64b2373128671c801727b1'
 )
 
-source_x86_64=("https://sourceforge.net/projects/leanote-desktop-app/files/${pkgver}/leanote-desktop-linux-x64-v${pkgver}.zip/download")
-source_i686=("https://sourceforge.net/projects/leanote-desktop-app/files/${pkgver}/leanote-desktop-linux-ia32-v${pkgver}.zip/download")
+source_x86_64=("${pkgname}-${pkgver}.zip::https://sourceforge.net/projects/leanote-desktop-app/files/${pkgver}/leanote-desktop-linux-x64-v${pkgver}.zip/download")
+source_i686=("${pkgname}-${pkgver}.zip::https://sourceforge.net/projects/leanote-desktop-app/files/${pkgver}/leanote-desktop-linux-ia32-v${pkgver}.zip/download")
 sha256sums_x86_64=('2d83504ed1537ff5263dda3056c2c57513e941ca0fb7900823c9c4a137f39983')
 sha256sums_i686=('f65a0c58f6ac77f71c522647f9acffee8790c466d3c5bb8246daceee2c657b51')
+noextract=("${pkgname}-${pkgver}.zip")
+
+prepare() {
+    echo "    Extracting files..."
+    mkdir -p src
+    bsdtar -xf ${pkgname}-${pkgver}.zip -C src
+}
 
 build() {
-	cd "${srcdir}"
+	cd "${srcdir}/src"
     rm -rf __MACOSX 
     rm -rf .DS_Store
 }
@@ -36,13 +43,13 @@ package() {
     install -d "${pkgdir}"/opt
     install -D -m655 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
     install -D -m644 "./${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -D -m644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -D -m644 "${srcdir}/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
-
-    rm -rf "${srcdir}/LICENSE"
-    rm -rf "${srcdir}/LICENSE.chromium.html"
-    rm -rf "${srcdir}/${pkgname}.png"
+    install -D -m644 "${srcdir}/src/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -D -m644 "${srcdir}/src/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 "${srcdir}/src/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
+    
+    rm -rf "${srcdir}/src/LICENSE"
+    rm -rf "${srcdir}/src/LICENSE.chromium.html"
+    rm -rf "${srcdir}/src/${pkgname}.png"
 
-    cp -R ${srcdir}/ "${pkgdir}/opt/leanote"
+    cp -R ${srcdir}/src/ "${pkgdir}/opt/leanote"
 }