Various fixes

7 files changed, 67 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eedd59eca8c0..9bc19c037a63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,23 @@
-# Generated by mksrcinfo v8
-# Mon Mar 20 14:05:10 UTC 2017
 pkgbase = ytd
-	pkgdesc = an utility for downloading multimedia content from YouTube and other online streaming services.
+	pkgdesc = An utility for downloading multimedia content from YouTube and other online streaming services.
 	pkgver = 1.59
-	pkgrel = 1
-	url = http://http://www.pepak.net/ytd/ytd/
+	pkgrel = 2
+	url = http://www.pepak.net/ytd/ytd/
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = BSD
 	depends = wine
+	depends = wine-mono
+	depends = wine_gecko
 	source = ytd
 	source = ytd.desktop
+	source = ytd.png
+	source = ytd.xml
 	source = http://www.pepak.net/files/youtube/ytd-1.59.zip
-	md5sums = fa41961f5092fa471145ade79584fd4b
-	md5sums = e10bfe126777f969da9eaf35edd0ba65
+	md5sums = cac6d1373933442fe3e5643d45775ea3
+	md5sums = 0f0a71d39ba930014e4612f76028ad8c
+	md5sums = c2d33f588cf2db34c04afcf8dbc4ea9e
+	md5sums = fce75f73f298761474a9634fbe483734
 	md5sums = e0997b348138215f218c6351a2f6729d
 
 pkgname = ytd
diff --git a/PKGBUILD b/PKGBUILD
index 9bf6acf2d0d2..0e70d02b306a 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,44 @@
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 # Contributor: Filip <fila pruda com>
 pkgname=ytd
 pkgver=1.59
-pkgrel=1
-pkgdesc="an utility for downloading multimedia content from YouTube and other online streaming services."
+pkgrel=2
+pkgdesc='An utility for downloading multimedia content from YouTube and other online streaming services.'
 arch=('i686' 'x86_64')
-url="http://http://www.pepak.net/ytd/ytd/"
-license=('GPL')
-depends=(wine)
+url='http://www.pepak.net/ytd/ytd/'
+license=('BSD')
+depends=('wine' 'wine-mono' 'wine_gecko')
 makedepends=()
-source=(ytd ytd.desktop http://www.pepak.net/files/youtube/ytd-$pkgver.zip)
+source=(
+	"$pkgname"
+	"$pkgname.desktop"
+	"$pkgname.png"
+	"$pkgname.xml"
+	"http://www.pepak.net/files/youtube/$pkgname-$pkgver.zip"
+	)
 md5sums=(
-	'fa41961f5092fa471145ade79584fd4b' 'e10bfe126777f969da9eaf35edd0ba65'
-	'e0997b348138215f218c6351a2f6729d')
+	'cac6d1373933442fe3e5643d45775ea3'
+	'0f0a71d39ba930014e4612f76028ad8c'
+	'c2d33f588cf2db34c04afcf8dbc4ea9e'
+	'fce75f73f298761474a9634fbe483734'
+	'e0997b348138215f218c6351a2f6729d'
+	)
 
 package() {
+	# bin
+	install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-  #bin
-  install -Dm755 ytd "$pkgdir/usr/bin/ytd"
-  
-  #app
-  install -d -m755 "$pkgdir/usr/share/ytd"
-  install -m644 ytd.exe ytd-defs.xml "$pkgdir/usr/share/ytd"
-  
-  install -d -m755 "$pkgdir/usr/share/ytd/locale"
-  cp -r locale/. "$pkgdir/usr/share/ytd/locale"
-  
-  #desktop icon
-  install -Dm644 ytd.desktop "$pkgdir/usr/share/applications/ytd.desktop"
-  
-  #docs
-  install -d -m755 "$pkgdir/usr/share/doc/ytd"
-  install -m644 doc/*.txt "$pkgdir/usr/share/doc/ytd"
-  
-}
\ No newline at end of file
+	# app
+	install -d -m755 "$pkgdir/usr/share/$pkgname/"
+	install -d -m755 "$pkgdir/usr/share/$pkgname/locale/"
+	install -m644 "$pkgname.exe" "$pkgname-defs.xml" "$pkgname.xml" "$pkgdir/usr/share/$pkgname"
+	cp -r locale/. "$pkgdir/usr/share/$pkgname/locale/"
+
+	# desktop
+	install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+	install -Dm644 "$pkgname.png" "$pkgdir/usr/share/icons/$pkgname.png"
+
+	# docs
+	install -d -m755 "$pkgdir/usr/share/doc/$pkgname/"
+	install -m644 doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
+}
diff --git a/ytd b/ytd
index 9aefddbce4eb..8c002175245b 100755
--- a/ytd
+++ b/ytd
@@ -2,18 +2,16 @@
 
 export WINEDEBUG=-all # Supresses Wine debug messages
 
-if [ ! -d "$HOME"/.ytd ] ; then
-   mkdir "$HOME"/.ytd
+if [ ! -d "$HOME/.ytd" ] ; then
+   mkdir "$HOME/.ytd"
    #prepare the environment here
-   cp /usr/share/ytd/ytd.xml "$HOME"/.ytd/ytd.xml || exit 1
-
-   ln -s /usr/share/ytd/ytd-defs.xml "$HOME"/.ytd/ytd-defs.xml || exit 1   
-   ln -s /usr/share/ytd/ytd.exe "$HOME"/.ytd/ytd.exe || exit 1
-   #ln -s /usr/share/ytd/msdl_dll.dll "$HOME"/.ytd/msdl_dll.dll || exit 1
-   #ln -s /usr/share/ytd/rtmpdump_dll.dll "$HOME"/.ytd/rtmpdump_dll.dll || exit 1
-   ln -s -T /usr/share/ytd/locale "$HOME"/.ytd/locale || exit 1
-   
+   cp '/usr/share/ytd/ytd.xml' "$HOME/.ytd/ytd.xml" || exit 1
+   ln -s '/usr/share/ytd/ytd-defs.xml' "$HOME/.ytd/ytd-defs.xml" || exit 1
+   ln -s '/usr/share/ytd/ytd.exe' "$HOME/.ytd/ytd.exe" || exit 1
+   #ln -s '/usr/share/ytd/msdl_dll.dll' "$HOME/.ytd/msdl_dll.dll" || exit 1
+   #ln -s '/usr/share/ytd/rtmpdump_dll.dll' "$HOME/.ytd/rtmpdump_dll.dll" || exit 1
+   ln -s -T '/usr/share/ytd/locale' "$HOME/.ytd/locale" || exit 1
 fi
 
-cd "$HOME"/.ytd/
-wine "$HOME"/.ytd/ytd.exe "$@"
+cd "$HOME/.ytd/"
+wine "$HOME/.ytd/ytd.exe" "$@"
diff --git a/ytd.desktop b/ytd.desktop
index 834b7fe4df0d..de4f500022d6 100644..100755
--- a/ytd.desktop
+++ b/ytd.desktop
@@ -1,4 +1,3 @@
-
 [Desktop Entry]
 Name=ytd
 GenericName=YouTube Downloader
@@ -7,7 +6,7 @@ Comment=an utility for downloading multimedia content from YouTube and other onl
 Comment[cs]=Nástroj pro stahování videa z YouTube a dalších webových úložišť videa
 Exec=ytd
 StartupNotify=true
-Icon=
+Icon=ytd
 Terminal=false
 X-MultipleArgs=false
 Type=Application
diff --git a/ytd.install b/ytd.install
deleted file mode 100644
index 724f3b0741a7..000000000000
--- a/ytd.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
-  post_install $1
-}
diff --git a/ytd.png b/ytd.png
new file mode 100644
index 000000000000..bb92cb4af35d
--- /dev/null
+++ b/ytd.png
diff --git a/ytd.xml b/ytd.xml
new file mode 100755
index 000000000000..9a5e3e7374ff
--- /dev/null
+++ b/ytd.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ytd>
+	<config>
+		<portable_mode>1</portable_mode>
+	</config>
+	<gui>
+		<check_for_new_version>0</check_for_new_version>
+	</gui>
+</ytd>