Fixes install

6 files changed, 40 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2394c0dbce20..0bcd943c74db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Jan 23 13:11:18 UTC 2016
 pkgbase = osu
 	pkgdesc = Freeware rhythm video game
-	pkgver = 20160123
+	pkgver = 20170118
 	pkgrel = 1
 	url = http://osu.ppy.sh
 	install = osu.install
@@ -12,20 +10,18 @@ pkgbase = osu
 	depends = wine
 	depends = xterm
 	depends = winetricks
+	depends = lib32-alsa-lib
+	depends = lib32-gnutls
 	source = http://m1.ppy.sh/r/osu!install.exe
 	source = directsound-latency.reg
 	source = osu.desktop
-	source = osu-fullscreen.desktop
 	source = osulauncher
 	source = osu.png
 	md5sums = SKIP
 	md5sums = 1d285eb3a5bdb6a70da89116dec18441
-	md5sums = d9749afe35fdd440e560d03b0a20a695
-	md5sums = 31bada75b7fe984395423c877d9bd036
-	md5sums = b627b6247932f614446b1b1993b4f3cc
+	md5sums = d6b3671e708e76152453e7e17bdfd919
+	md5sums = e476890981d4ece50b676f7e95c6d07d
 	md5sums = 33164b758af5645efca61a99f6ddd342
-	depends_x86_64 = lib32-alsa-lib
-	depends_x86_64 = lib32-gnutls
 
 pkgname = osu
 
diff --git a/PKGBUILD b/PKGBUILD
index f175ad6ea000..3e6b16dd61a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,20 @@
-# Maintainer: ValdikSS <iam@valdikss.org.ru>
+# Maintainer: emersion <contact@emersion.fr>
 # Contributor: ValdikSS <iam@valdikss.org.ru>
 
 pkgname=osu
-pkgver=20160123
+pkgver=20170118
 pkgrel=1
 
 source=("http://m1.ppy.sh/r/osu!install.exe"
 	"directsound-latency.reg"
 	"osu.desktop"
-	"osu-fullscreen.desktop"
 	"osulauncher"
 	"osu.png")
 
 md5sums=('SKIP'
          '1d285eb3a5bdb6a70da89116dec18441'
-         'd9749afe35fdd440e560d03b0a20a695'
-         '31bada75b7fe984395423c877d9bd036'
-         'b627b6247932f614446b1b1993b4f3cc'
+         'd6b3671e708e76152453e7e17bdfd919'
+         'e476890981d4ece50b676f7e95c6d07d'
          '33164b758af5645efca61a99f6ddd342')
 
 pkgdesc="Freeware rhythm video game"
@@ -32,7 +30,6 @@ package() {
     cd "$srcdir"
 
     install -Dm644 osu.desktop "$pkgdir/usr/share/applications/osu.desktop"
-    install -Dm644 osu-fullscreen.desktop "$pkgdir/usr/share/applications/osu-fullscreen.desktop"
     install -Dm644 osu.png "$pkgdir/opt/osu/osu.png"
     install -Dm644 directsound-latency.reg "$pkgdir/opt/osu/directsound-latency.reg"
     install -Dm755 osulauncher "$pkgdir/opt/osu/"
diff --git a/osu-fullscreen.desktop b/osu-fullscreen.desktop
deleted file mode 100644
index a2b0b440a987..000000000000
--- a/osu-fullscreen.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=osu! (fullscreen)
-Comment=Freeware rhythm video game
-GenericName=Freeware rhythm video game
-Exec=/opt/osu/osulauncher fullscreen
-Icon=/opt/osu/osu.png
-Terminal=false
-Categories=Game;
diff --git a/osu.desktop b/osu.desktop
index 0932d2933358..cd2930543c75 100644
--- a/osu.desktop
+++ b/osu.desktop
@@ -4,7 +4,8 @@ Encoding=UTF-8
 Name=osu!
 Comment=Freeware rhythm video game
 GenericName=Freeware rhythm video game
-Exec=/opt/osu/osulauncher
+Exec=/opt/osu/osulauncher %F
 Icon=/opt/osu/osu.png
 Terminal=false
 Categories=Game;
+MimeType=application/x-wine-extension-osz;application/x-wine-extension-osk;application/x-wine-extension-osr;application/x-wine-extension-osz2;
diff --git a/osu.install b/osu.install
index 0f23b9fa6979..7aebf81da689 100644
--- a/osu.install
+++ b/osu.install
@@ -2,8 +2,11 @@ post_install() {
     #chmod g+s "/opt/osu/game/"
     #chmod g+w "/opt/osu/game/"
     update-desktop-database -q
-    echo "To run this game, you have to be in 'games' group"
-    echo "Use 'sudo gpasswd -a YOUR_USERNAME games'"
+    #echo "To run this game, you have to be in 'games' group"
+    #echo "Use 'sudo gpasswd -a YOUR_USERNAME games'"
+    #echo
+    echo "If you want to install optional dependencies, run:"
+    echo "/opt/osu/osulauncher install-optional"
     echo
     echo "If you experience sound lag with alsa, you might try to add something like"
     echo "http://pastebin.com/djQGVmHf in your $HOME/.asoundrc (or /etc/asound.conf)"
diff --git a/osulauncher b/osulauncher
index 4bedf82a7779..b1d1dd5ba60a 100755
--- a/osulauncher
+++ b/osulauncher
@@ -34,22 +34,35 @@ function doinstall {
     echo "Do NOT install Mono (press cancel)!"
     wine hh || exit 1
     echo "Wineprefix created successfully!"
-    echo "Installing .NET 4.0 and gdi"
+    echo "Installing .NET 4.5"
     if [ -z "$(which winetricks)" ]
     then
         echo "Installation failed. Please install winetricks."
         read
         exit 1
     fi
-    winetricks dotnet40 gdiplus || (doremove && exit 1)
-    echo ".NET 4.0 and gdi instlled successfully!"
+    winetricks dotnet45 || (doremove && exit 1)
+    echo ".NET 4.5 installed successfully!"
     echo
     echo "Applying some settings..."
     winetricks ddr=opengl fontsmooth=rgb sound=alsa strictdrawordering=enabled
     regedit /opt/osu/directsound-latency.reg
     echo "All done! Running osu! updater..."
-    sleep 10
-    wine /opt/osu/game/osu\!install.exe
+    sleep 1
+    cp "/opt/osu/game/osu!install.exe" "$WINEPREFIX/osu!install.exe"
+    wine "$WINEPREFIX/osu!install.exe"
+}
+
+function doinstalloptional {
+    if [ ! -d "$WINEPREFIX" ]
+    then
+        doinstall
+    fi
+
+    echo "Installing optional dependencies for osu!"
+    echo
+
+    winetricks gdiplus corefonts cjkfonts
 }
 
 function doremove {
@@ -64,6 +77,11 @@ case "$1" in
  exit 0
  ;;
 
+"install-optional")
+ doinstalloptional
+ exit 0
+ ;;
+
 "remove")
  doremove
  exit 0
@@ -102,10 +120,4 @@ then
     fi
 fi
 
-if [ "$1" == "fullscreen" ]
-then
-    RES="$(xrandr | grep +0 | awk '{print $3}' | sed 's/+0+0//')"
-    vblank_mode=0 wine explorer /desktop=osu,$RES /opt/osu/game/osu\!.exe $@
-else
-    vblank_mode=0 wine /opt/osu/game/osu\!.exe $@
-fi
+vblank_mode=0 wine "$WINEPREFIX/drive_c/users/$USER/Local Settings/Application Data/osu!/osu!.exe" $@