Rework to not require wget, put hicolor dependency back, consistent indentation

4 files changed, 70 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c25359d1fe2..ff49f147f7ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = jdownloader2
-	pkgdesc = Download manager, written in Java, for one-click hosting sites like Rapidshare and Megaupload. Uses its own updater.
+	pkgdesc = Download manager, written in Java, for one-click hosting sites like Rapidshare and MEGA. Uses its own updater.
 	pkgver = latest
-	pkgrel = 17
+	pkgrel = 18
 	url = https://jdownloader.org/
 	install = jdownloader.install
 	arch = any
 	license = GPL
 	depends = java-runtime
-	depends = wget
 	depends = libarchive
+	depends = hicolor-icon-theme
 	optdepends = phantomjs: needed for some remote capture solving
-	conflicts = jdownloader
-	replaces = jdownloader
 	source = JDownloader
 	source = JDownloaderHeadless
 	source = JDownloaderHeadlessCtl
@@ -36,7 +34,7 @@ pkgbase = jdownloader2
 	sha256sums = cab5904f226028fdc9384f407ceca34b4305885176fad29b08a2e8b83653a345
 	sha256sums = d555c78d8110e536aee67de765ee5134d872fbb48354050f7b2f14ff5499120a
 	sha256sums = dca392fad29c70eff609ec25abaefd33343c8a6c98088e0719c6746759ed0aa5
-	sha256sums = 70f4a5cd95532c70ae20a357e655d01ac23fe92bb71feac45973e2b53d024cff
+	sha256sums = ddea1dc41023cfdae4db91a23a86ebf8a6be294ee8ba59307f68f97c839d5f31
 	sha256sums = 1c9949bfeaf3595783eec9501e600cb8c4443e04f72d57c095560fb66dcd53d1
 	sha256sums = c4301592694b3273ed44814debcc03bf1e4fc85882954f5c03e55508c53c4491
 	sha256sums = 44a499df472328f9034f9972aad02df0fc27a45ef1bb3e9314576d2fa9fdfcbe
@@ -56,4 +54,3 @@ pkgbase = jdownloader2
 	sha256sums = 8d170fd301b37302a4f64cec759bdb5c879cb30c8b8e94120f3f985df1d31b7f
 
 pkgname = jdownloader2
-
diff --git a/PKGBUILD b/PKGBUILD
index 11bd8fa8add2..104fc479bece 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
-# Maintainer: Derson5
+# Maintainer: Martin Rys <rys.pw/contact>
+# Previous maintainer: Derson5
 pkgname=jdownloader2
 pkgver=latest
-pkgrel=17
-pkgdesc='Download manager, written in Java, for one-click hosting sites like Rapidshare and Megaupload. Uses its own updater.'
+pkgrel=18
+pkgdesc='Download manager, written in Java, for one-click hosting sites like Rapidshare and MEGA. Uses its own updater.'
 arch=('any')
-conflicts=('jdownloader')
-replaces=('jdownloader')
+conflicts=()
+replaces=()
 url='https://jdownloader.org/'
 license=('GPL')
-depends=('java-runtime' 'wget' 'libarchive')
+depends=('java-runtime' 'libarchive' 'hicolor-icon-theme')
 optdepends=('phantomjs: needed for some remote capture solving')
 install='jdownloader.install'
 source=('JDownloader'
@@ -35,9 +36,8 @@ source=('JDownloader'
 sha256sums=('cab5904f226028fdc9384f407ceca34b4305885176fad29b08a2e8b83653a345'
             'd555c78d8110e536aee67de765ee5134d872fbb48354050f7b2f14ff5499120a'
             'dca392fad29c70eff609ec25abaefd33343c8a6c98088e0719c6746759ed0aa5'
-            '70f4a5cd95532c70ae20a357e655d01ac23fe92bb71feac45973e2b53d024cff'
+            'ddea1dc41023cfdae4db91a23a86ebf8a6be294ee8ba59307f68f97c839d5f31'
             '1c9949bfeaf3595783eec9501e600cb8c4443e04f72d57c095560fb66dcd53d1'
-            
             'c4301592694b3273ed44814debcc03bf1e4fc85882954f5c03e55508c53c4491'
             '44a499df472328f9034f9972aad02df0fc27a45ef1bb3e9314576d2fa9fdfcbe'
             '92cfbe543ee1f9e094347dbd9c0c6a59bd52974145f00dbece8ed0da9a828bfa'
@@ -61,8 +61,7 @@ package() {
   install -D -m755 "$srcdir/JDownloaderHeadlessCtl" "$pkgdir/opt/JDownloaderScripts/JDownloaderHeadlessCtl"
   install -D -m755 "$srcdir/functions.sh" "$pkgdir/opt/JDownloaderScripts/functions.sh"
 	install -D -m755 "$srcdir/JDownloaderHeadlessCleanLogin" "$pkgdir/opt/JDownloaderScripts/JDownloaderHeadlessCleanLogin"
-	
-  
+
   install -D -m644 "$srcdir/jdownloader.xml" "$pkgdir/usr/share/mime/packages/jdownloader.xml"
 	install -D -m644 "$srcdir/jdownloader.desktop" "$pkgdir/usr/share/applications/jdownloader.desktop"
 	install -D -m644 "$srcdir/jd-containers.desktop" "$pkgdir/usr/share/applications/jd-containers.desktop"
@@ -80,11 +79,11 @@ package() {
 	install -D -m644 "$srcdir/jdownloader256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/jdownloader.png"
 	install -D -m644 "$srcdir/jdownloader.service" "$pkgdir/usr/lib/systemd/system/jdownloader.service"
 	install -d -m2775 "$pkgdir/opt/JDownloader"
-  mkdir -p "$pkgdir/usr/bin"
-  
-  ln -s "/opt/JDownloaderScripts/JDownloader"  "${pkgdir}/usr/bin/JDownloader"
+	mkdir -p "$pkgdir/usr/bin"
+
+	ln -s "/opt/JDownloaderScripts/JDownloader"  "${pkgdir}/usr/bin/JDownloader"
 	ln -s "/opt/JDownloaderScripts/JDownloader" "${pkgdir}/usr/bin/jdownloader"
-  ln -s "/opt/JDownloaderScripts/JDownloaderHeadless" "${pkgdir}/usr/bin/JDownloaderHeadless" 
-  ln -s "/opt/JDownloaderScripts/JDownloaderHeadlessCtl" "${pkgdir}/usr/bin/JDownloaderHeadlessCtl"
-  ln -s "/opt/JDownloaderScripts/JDownloaderHeadlessCleanLogin" "${pkgdir}/usr/bin/JDownloaderHeadlessCleanLogin" 
+	ln -s "/opt/JDownloaderScripts/JDownloaderHeadless" "${pkgdir}/usr/bin/JDownloaderHeadless"
+	ln -s "/opt/JDownloaderScripts/JDownloaderHeadlessCtl" "${pkgdir}/usr/bin/JDownloaderHeadlessCtl"
+	ln -s "/opt/JDownloaderScripts/JDownloaderHeadlessCleanLogin" "${pkgdir}/usr/bin/JDownloaderHeadlessCleanLogin"
 }
diff --git a/functions.sh b/functions.sh
index dcac4f3ad1c0..39082286b739 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1,48 +1,45 @@
 #!/usr/bin/env bash
 
-function changePath(){
-  # check the groups of the current loggedin users
-  groups | grep -q -E '(\s|^)jdownloader(\s|$)' >/dev/null
-  if [ "$?" -eq  0 ] || isRoot ; then
-    export JD_SCOPE="global"
-    echo "[global JDownloader scope]"
-    umask u=rwx,g=rwx,o=rx
-    cd '/opt/JDownloader'
-  else
-    export JD_SCOPE="user"
-    echo "[user JDownloader scope]"
-    mkdir -p "${HOME}/.jd"
-    cd "${HOME}/.jd"
-  fi
+function changePath() {
+	# check the groups of the current loggedin users
+	groups | grep -q -E '(\s|^)jdownloader(\s|$)' >/dev/null
+	if [ "$?" -eq  0 ] || isRoot ; then
+		export JD_SCOPE="global"
+		echo "[global JDownloader scope]"
+		umask u=rwx,g=rwx,o=rx
+		cd '/opt/JDownloader'
+	else
+		export JD_SCOPE="user"
+		echo "[user JDownloader scope]"
+		mkdir -p "${HOME}/.jd"
+		cd "${HOME}/.jd"
+	fi
 }
 
-function changeUser(){
-  if isRoot ; then
-    #restart as user jdownloader
-    echo "changing to user \"jdownloader\""
-    runuser jdownloader -c "/bin/bash $0 $@" -s /bin/bash
-    exit $?
-  fi
-  
+function changeUser() {
+	if isRoot; then
+		# restart as user jdownloader
+		echo "changing to user \"jdownloader\""
+		runuser jdownloader -c "/bin/bash $0 $@" -s /bin/bash
+		exit $?
+	fi
 }
 
-function isRoot(){
-  if [ "$(id -u)" -eq "0" ]; then
-    return 0
-  fi
-  return 2
+function isRoot() {
+	if [ "$(id -u)" -eq "0" ]; then
+		return 0
+	fi
+	return 2
 }
 
-
-function downloadJDownloader(){
-  changePath
-  if [ ! -f "JDownloader.jar" ]; then
-    wget -O JDownloader.jar http://installer.jdownloader.org/JDownloader.jar
-    if [ $? -ne 0 ]; then
-      echo "Cannot download Jdownloader!"
-      exit 2
-    fi
-  fi
+function downloadJDownloader() {
+	changePath
+	if [ ! -f "JDownloader.jar" ]; then
+		if ! curl -o JDownloader.jar https://installer.jdownloader.org/JDownloader.jar; then
+			echo "Cannot download JDownloader!"
+			exit 2
+		fi
+	fi
 }
-LOGFILE="JDownloader.service.log"
 
+LOGFILE="JDownloader.service.log"
diff --git a/jdownloader.install b/jdownloader.install
index 650e92fa25ae..c74f7b64f9ea 100644
--- a/jdownloader.install
+++ b/jdownloader.install
@@ -1,24 +1,24 @@
 post_install() {
-    getent group jdownloader &>/dev/null || groupadd -r jdownloader >/dev/null
-        getent passwd jdownloader &>/dev/null || useradd -r -g jdownloader -d /opt/JDownloader/ -s /bin/false -c jdownloader jdownloader >/dev/null
-    if [ -d "/opt/JDownloader/" ]; then
-        chown -R jdownloader:jdownloader /opt/JDownloader/
-        chmod -R 0775 /opt/JDownloader/
-        chmod g+s "/opt/JDownloader"
-        setfacl -d -m u::rwx,g::rwx,o::rx "/opt/JDownloader"
-    fi
-    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-        update-mime-database /usr/share/mime
-    echo "Don't forget: You have to run 'JDownloaderHeadless' multiple times manually until you've configured MyJdownloader settings"
+	getent group jdownloader &>/dev/null || groupadd -r jdownloader >/dev/null
+	getent passwd jdownloader &>/dev/null || useradd -r -g jdownloader -d /opt/JDownloader/ -s /bin/false -c jdownloader jdownloader >/dev/null
+	if [ -d "/opt/JDownloader/" ]; then
+		chown -R jdownloader:jdownloader /opt/JDownloader/
+		chmod -R 0775 /opt/JDownloader/
+		chmod g+s "/opt/JDownloader"
+		setfacl -d -m u::rwx,g::rwx,o::rx "/opt/JDownloader"
+	fi
+	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+	update-desktop-database -q
+	update-mime-database /usr/share/mime
+	echo "Don't forget: You have to run 'JDownloaderHeadless' multiple times manually until you've configured MyJdownloader settings"
 }
 
 post_upgrade() {
-    post_install
+	post_install
 }
 
 post_remove() {
-    getent passwd jdownloader &>/dev/null && userdel jdownloader >/dev/null
-        getent group jdownloader &>/dev/null && groupdel jdownloader >/dev/null
-        rm -Rf /opt/JDownloader
+	getent passwd jdownloader &>/dev/null && userdel jdownloader >/dev/null
+	getent group jdownloader &>/dev/null && groupdel jdownloader >/dev/null
+	rm -rf /opt/JDownloader
 }