Mic238 Wrapper

README.md

@@ -1,15 +1,43 @@
-# OSX wrapper for osu! (using wineskin)
+# osu! for Mac Stable (Latest)
+[Original Repo link](https://github.com/Mic238/osu-for-Mac-Stable-Latest)
 
-Make sure you install [XQuartz 2.7.7 or higher](http://www.xquartz.org) first.	
-You will need to download the latest version of osu! from [here](https://osu.ppy.sh/p/download) and place it inside the .app (`osu!.app/drive_c/osu!/`)	
-Something like: ```curl -ks https://m1.ppy.sh/r/osu\!.exe\?`date +%s` > osu\!.app/drive_c/osu\!/osu\!.exe```
+### Step to Install:
+1. Download zip (196M) from this page, it should be sitting in Download folder.
 
-# On first run
-Ignore this error:	
-![](https://puu.sh/oqqz1/79cad76754.png)
+2. If you are upgrading from the old client, DO NOT move to /Application and replace the old client immediately. There are some migration need to do.
+   1. Open osu! folder for both old and new clients (right click on app - show package content - drive_c - Program Files - osu!)
+   2. Hold command key and select all of the following folders and files from the old client side
+		* Folders: Data, Songs, Skins
+		* Files: collection.db, presence.db, scores.db, osu!.db, osu!.cfg, osu!.[Username].cfg
+   3. Drag them to the new client side while holding option key. Note: If a symlink a created instead of copying the actual file (A symlink can be identified by an arrow at the corner), remove those symlink files and repeat those steps
+
+3. Open the new client by right click and select open.
+   * An error of no runtime can be ignored.
+   * If prompted Gecko package is not installed, click cancel.
+   * When osu! installer appear, change the install location before countdown and select drive_c/Program Files/osu!
+   * osu! will take a while to download and install itself. The game will start automatically when it finishes.
+4. For the best perfomance, go to setting, set the frame limit to 240fps (Unlimited would not work properly) and turn full screen mode off.
+5. Play a few games. If you're happy with it, move the game to /Application and enjoy!
 
-Hit cancel:    
-![](https://puu.sh/oqqzA/e0dd2d9b55.png)
+---------------------------
+### Testing Environment:
+Mac Mini (Late 2014) 2.6GHz, 8G Memory, 256G SSD, MacOS High Sierra 10.13.4, Wrapper Wineskin-2.6.2, Engine WS9Wine2.22
 
-Let osu! update and hopefully it should run :)
+---------------------------
+### A Little Bouns for all:
 
+To move the beatmaps faster, open the terminal, copy and paste this command followed by return:
+* `echo "alias osu='mv ~/Downloads/*.osz /Applications/osu\!.app/drive_c/Program\ Files/osu\!/songs'" >> .bash_profile`
+
+Restart terminal and from now on, you can simply type "osu" in the terminal to move all beatmaps from download folder to game beatmap folder, don't forget to fn+f5 to refresh the game list.
+
+---------------------------
+### Known Issues
+1. With 2018-001 update installed, wine package downloaded with browser will not open. However, download with git clone would work properly.
+2. gdiplus is not compactible with cjkfonts, so it's a trade off to get the setting icons and control buttons work and cjkfonts work. If you prefer cjkfonts more than those graphic glitches, you can follow these steps:
+   1. Right click osu! - show package content - open wineskin - click advance.
+   2. Click tools at the top - config Utility on top left, The config windows may take a few seconds to jump out.
+   3. Go to Libries tab at the top - select gdiplus and click edit - then select built in (wine) and save.
+   4. You can revert this setting by the same steps and select native (windows) to revert.
+3. For in-game settings, Shaders would not work, enable Soften Filters will blank the screen, enable Compactible Mode will crash the game. If you accidently turn these settings on, you can go to osu! folder and edit osu!.[Username].cfg with textedit and change the value of BloomSoftening or CompactibilityContext to 0 to fix it.
+4. Some other glitches, osu! Direct from osu website would not work (in-game download works good). Discord-rpc will not work. Double Clicking beatmap files or dragging to game window will not open them (So the only way to import beatmaps is move to the folder manually, or use the command above).

osu!.app/Contents/Frameworks/wswine.bundle/bin/msiexec

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/notepad

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/regedit

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/regsvr32

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/wine

@@ -1,2 +1,2 @@
 #!/bin/bash
-DYLD_FALLBACK_LIBRARY_PATH="${WINESKIN_LIB_PATH_FOR_FALLBACK}" "$(dirname "$0")/osu!92068297Wine" "$@"
+DYLD_FALLBACK_LIBRARY_PATH="${WINESKIN_LIB_PATH_FOR_FALLBACK}" "$(dirname "$0")/osu!387842082Wine" "$@"

osu!.app/Contents/Frameworks/wswine.bundle/bin/wineboot

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/winecfg

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/wineconsole

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/winedbg

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/winefile

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/winemaker

@@ -328,7 +328,7 @@ my $P_PATH=0;
 
 ##
 # This index contains a reference to an array containing the project-wide
-# settings. The structure of that arrray is actually identical to that of
+# settings. The structure of that array is actually identical to that of
 # a regular target since it can also contain extra sources.
 my $P_SETTINGS=1;
 
@@ -767,7 +767,7 @@ sub source_scan_project_file($$$)
                         # Build a DLL
                         $prj_target_type=$TT_DLL;
                     } elsif (/^incremental:[[:alpha:]]+$/) {
-                        # Link Incrmentally
+                        # Link Incrementally
                     } elsif (/^implib:/) {
                         # Name import library
                     } elsif (/^libpath:\"(.*)\"/) {
@@ -967,6 +967,7 @@ sub source_scan_project_file($$$)
                     }
                     if ($vc_compiler_tool->getName eq "PreprocessorDefinitions") {
                         $configt=$vc_compiler_tool->getValue;
+                        $configt=~s/;+$//;
                         $configt=~s/;\s*/ -D/g;
                         $prj_target_defines.="-D".$configt." ";
                     }

osu!.app/Contents/Frameworks/wswine.bundle/bin/winemine

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/winepath

@@ -57,8 +57,8 @@ do
 done
 
 # finally, the default bin directory
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
-if [ -x "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine" "$appname" "$@"; fi
+if [ -x "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" ]; then exec "/Users/gverm/Desktop/tmp/WineskinEngineBuilder/wswine.bundle/bin/wine64" "$appname" "$@"; fi
 
 echo "$0: the Wine loader is missing"
 exit 1

osu!.app/Contents/Frameworks/wswine.bundle/bin/wineserver

@@ -1,2 +1,2 @@
 #!/bin/bash
-DYLD_FALLBACK_LIBRARY_PATH="${WINESKIN_LIB_PATH_FOR_FALLBACK}" "$(dirname "$0")/osu!92068297Wineserver" "$@"
+DYLD_FALLBACK_LIBRARY_PATH="${WINESKIN_LIB_PATH_FOR_FALLBACK}" "$(dirname "$0")/osu!387842082Wineserver" "$@"