v454-3 - file association

5 files changed, 28 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0161459f172..df8ebf0faec7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Mar 14 08:09:35 UTC 2017
+# Tue Apr 18 09:39:01 UTC 2017
 pkgbase = scratch2
 	pkgdesc = With Scratch, you can program your own interactive stories, games, and animations
 	pkgver = 2.0.454
-	pkgrel = 2
+	pkgrel = 3
 	url = https://scratch.mit.edu
 	arch = any
 	license = GPL
@@ -16,9 +16,13 @@ pkgbase = scratch2
 	source = https://scratch.mit.edu/scratchr2/static/sa/Scratch-454.air
 	source = scratch2.desktop
 	source = scratch2.png
+	source = scratch2.xml
+	source = x-scratch2-project.png
 	sha1sums = c096866c40c63f36ccf11539433eb7ae66797adf
-	sha1sums = 1f38f3a41cd256f3d34fc2dbefcc290681160109
+	sha1sums = 24d3849d3e38836b0b116a2e620a173f1770f13b
 	sha1sums = bfca77daa1a9079f2197d98509ca4a33b3246df1
+	sha1sums = 2d45707fd12c709e21fa74b85f6c7b7dfe0d47a2
+	sha1sums = 211b6b6ca9e987327632446f1bb15908babbcfae
 
 pkgname = scratch2
 
diff --git a/PKGBUILD b/PKGBUILD
index a2da5253ef08..ab784ed33a52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=scratch2
 _ver=454
 pkgver="2.0.$_ver"
-pkgrel=2
+pkgrel=3
 pkgdesc="With Scratch, you can program your own interactive stories, games, and animations"
 arch=('any')
 url="https://scratch.mit.edu"
@@ -11,10 +11,12 @@ license=('GPL')
 depends=('adobe-air' 'libxt' 'libxtst' 'alsa-lib')
 depends_x86_64+=('lib32-libxt' 'lib32-libxtst' 'lib32-alsa-lib')
 makedepends=('unzip')
-source=("https://scratch.mit.edu/scratchr2/static/sa/Scratch-$_ver.air" "$pkgname.desktop" "$pkgname.png")
+source=("https://scratch.mit.edu/scratchr2/static/sa/Scratch-$_ver.air" "$pkgname.desktop" "$pkgname.png" "$pkgname.xml" "x-$pkgname-project.png")
 sha1sums=('c096866c40c63f36ccf11539433eb7ae66797adf'
-			'1f38f3a41cd256f3d34fc2dbefcc290681160109'
-			'bfca77daa1a9079f2197d98509ca4a33b3246df1')
+			'24d3849d3e38836b0b116a2e620a173f1770f13b'
+			'bfca77daa1a9079f2197d98509ca4a33b3246df1'
+			'2d45707fd12c709e21fa74b85f6c7b7dfe0d47a2'
+			'211b6b6ca9e987327632446f1bb15908babbcfae')
 noextract=("Scratch-$_ver.air")
 
 package() {
@@ -27,9 +29,11 @@ package() {
 
   install -dm 755 $pkgdir/usr/bin
   echo "#!/bin/bash" >> $pkgdir/usr/bin/$pkgname
-  echo "/opt/adobe-air-sdk/bin/adl -nodebug /opt/airapps/$pkgname/META-INF/AIR/application.xml /opt/airapps/$pkgname/" >> $pkgdir/usr/bin/$pkgname
+  echo "/opt/adobe-air-sdk/bin/adl -nodebug /opt/airapps/$pkgname/META-INF/AIR/application.xml /opt/airapps/$pkgname/ -- \"\$1\"" >> $pkgdir/usr/bin/$pkgname
   chmod 755 $pkgdir/usr/bin/$pkgname
 
   install -Dm 644 "$pkgname.desktop" $pkgdir/usr/share/applications/$pkgname.desktop
-  install -Dm 644 "$pkgname.png" $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -Dm 644 "$pkgname.xml" $pkgdir/usr/share/mime/packages/$pkgname.xml
+  install -Dm 644 "$pkgname.png" $pkgdir/usr/share/pixmaps/$pkgname-editor.png
+  install -Dm 644 "x-$pkgname-project.png" $pkgdir/usr/share/pixmaps/x-$pkgname-project.png
 }
diff --git a/scratch2.desktop b/scratch2.desktop
index e1eb264e2b89..b95af4e51993 100644
--- a/scratch2.desktop
+++ b/scratch2.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Scratch 2.0
 Comment=You can program your own interactive stories, games, and animations
-Exec=scratch2
+Exec=scratch2 %f
 Terminal=false
 Type=Application
-Icon=scratch2
+Icon=scratch2-editor
 Categories=Development;Education;Programming;
-MimeType=application/x-scratch-project
+MimeType=application/x-scratch2-project
diff --git a/scratch2.xml b/scratch2.xml
new file mode 100644
index 000000000000..af1d640ca991
--- /dev/null
+++ b/scratch2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> 
+    <mime-type type="application/x-scratch2-project"> 
+        <comment>Scratch 2.0 project file</comment> 
+	<generic-icon name="x-scratch2-project"/>
+        <glob pattern="*.sb2"/> 
+    </mime-type> 
+</mime-info> 
diff --git a/x-scratch2-project.png b/x-scratch2-project.png
new file mode 100644
index 000000000000..668883e5b973
--- /dev/null
+++ b/x-scratch2-project.png