modify version and clean code

4 files changed, 67 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74c268ddd010..caa72b936640 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,29 @@
 pkgbase = lantern
-	pkgdesc = Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. Stable version
-	pkgver = 2.0.0+stable
-	pkgrel = 2
-	url = https://getlantern.org/
+	pkgdesc = Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel)
+	pkgver = 2.0.0
+	pkgrel = 1
+	url = https://getlantern.org
+	install = lantern.install
 	arch = i686
 	arch = x86_64
-	license = custom
-	depends = gtk3
+	license = Apache
+	depends = hicolor-icon-theme
 	depends = bzip2
 	depends = dbus
 	depends = glib2
+	depends = gtk3
 	depends = libappindicator-gtk3
+	depends = mesa
 	depends = xcb-util
+	depends = xdg-utils
 	depends = zlib
-	depends = mesa
-	source_i686 = lantern-installer-32.deb::https://github.com/getlantern/lantern-binaries/blob/master/lantern-installer-32.deb?raw=true
+	provides = lantern
+	options = !emptydirs
+	options = !strip
+	options = !docs
+	source_i686 = lantern-installer-32.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32.deb
 	sha1sums_i686 = 3c8649d2a54986604b08c712625bd9468bf1549c
-	source_x86_64 = lantern-installer-64.deb::https://github.com/getlantern/lantern-binaries/blob/master/lantern-installer-64.deb?raw=true
+	source_x86_64 = lantern-installer-64.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64.deb
 	sha1sums_x86_64 = 884bc1cadf2cdafd17e6d10414361ccf56d2b0bd
 
 pkgname = lantern
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b6c0cd1634e6..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.deb
-src
-pkg
-*.src.tar.gz
-*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 54e71c0d5bb9..fc689d8846e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,26 @@
+#Submitter: neo.shadowsocks<neo.shadowsocks AT gmx.com>
+# Maintainer: Kars Wang <jaklsy g-mail>
+
 pkgname=lantern
-pkgver=2.0.0+stable
-pkgrel=2
-pkgdesc='Lantern is a free desktop application that delivers fast, reliable and secure access to the
-open Internet. Stable version'
+pkgver=2.0.0
+pkgrel=1
+pkgdesc='Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel)'
 arch=('i686' 'x86_64')
-url='https://getlantern.org/'
-license=('custom')
-# I got it by ldd the lantern-binary as deb metadata doesn't provides it.
-# And remove duplicated, like atk required by gtk3
-depends=('gtk3' 'bzip2' 'dbus' 'glib2' 'libappindicator-gtk3' 'xcb-util'
-	 'zlib' 'mesa')
-
-source_i686=("lantern-installer-32.deb::https://github.com/getlantern/lantern-binaries/blob/master/lantern-installer-32.deb?raw=true")
-source_x86_64=("lantern-installer-64.deb::https://github.com/getlantern/lantern-binaries/blob/master/lantern-installer-64.deb?raw=true")
+url='https://getlantern.org'
+license=('Apache')
 
+# neo: I got it by ldd the lantern-binary as deb metadata doesn't provides it,
+# and remove duplicated, like atk required by gtk3
+depends=('hicolor-icon-theme' 'bzip2' 'dbus' 'glib2' 'gtk3' 'libappindicator-gtk3' 'mesa' 'xcb-util' 'xdg-utils' 'zlib')
+provides=('lantern')
+options=('!emptydirs' '!strip' '!docs')
+install=$pkgname.install
+source_i686=('lantern-installer-32.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32.deb')
+source_x86_64=('lantern-installer-64.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64.deb')
 sha1sums_i686=('3c8649d2a54986604b08c712625bd9468bf1549c')
 sha1sums_x86_64=('884bc1cadf2cdafd17e6d10414361ccf56d2b0bd')
 
 package() {
-	tar xf data.tar.xz
-	mkdir -p "$pkgdir/usr/bin/"
-	ln -s "/usr/lib/lantern/lantern.sh" "$pkgdir/usr/bin/lantern"
-	install -Dm755 usr/lib/lantern/lantern-binary \
-		"$pkgdir/usr/lib/lantern/lantern-binary"
-	install -Dm755 usr/lib/lantern/lantern.sh \
-		"$pkgdir/usr/lib/lantern/lantern.sh"
-	install -Dm644 usr/share/applications/lantern.desktop \
-		"$pkgdir/usr/share/applications/lantern.desktop"
-	install -Dm644 usr/share/doc/lantern/changelog.Debian.gz \
-		"$pkgdir/usr/share/doc/lantern/changelog.Debian.gz"
-	install -Dm644 usr/share/doc/lantern/copyright \
-		"$pkgdir/usr/share/doc/lantern/copyright"
-	install -Dm644 usr/share/icons/hicolor/128x128/apps/lantern.png \
-		"$pkgdir/usr/share/icons/hicolor/128x128/apps/lantern.png"
+    msg2 'Extracting the data.tar.xz...'
+    bsdtar -xf data.tar.xz -C "${pkgdir}/"
 }
diff --git a/lantern.install b/lantern.install
new file mode 100644
index 000000000000..fa46fd905850
--- /dev/null
+++ b/lantern.install
@@ -0,0 +1,33 @@
+# Colored makepkg-like functions
+all_off="$(tput sgr0)"
+bold="${all_off}$(tput bold)"
+blue="${bold}$(tput setaf 4)"
+yellow="${bold}$(tput setaf 3)"
+
+msg_blue() {
+    printf "${blue}==>${bold} $1${all_off}\n"
+}
+
+note() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
+_update() {
+    msg_blue "Updating desktop MIME database..."
+    update-desktop-database -q
+
+    msg_blue "Updating icon cache.."
+    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+}
+
+post_install() {
+    _update
+}
+
+post_upgrade() {
+    _update
+}
+
+post_remove() {
+    _update
+}