Skip to content

Commit

Permalink
Fix bash scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gcenx
Gcenx committed Jan 4, 2020
1 parent cbd488b commit 88bbea0
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions WineskinLauncher/WineskinLauncherAppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1553,9 +1553,9 @@ - (void)fixWine32ExecutableNames
NSString* binBash = @"#!/bin/bash\n";
NSString* dyldFallbackLibraryPath = @"DYLD_FALLBACK_LIBRARY_PATH=\"${WINESKIN_LIB_PATH_FOR_FALLBACK}\"";

NSString *wineBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineName];
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineServerName];

[wineBash writeToFile:[NSString stringWithFormat:@"%@/wine",pathToWineBinFolder] atomically:YES encoding:NSUTF8StringEncoding];
Expand Down Expand Up @@ -1643,11 +1643,11 @@ - (void)fixWine64ExecutableNames
NSString* binBash = @"#!/bin/bash\n";
NSString* dyldFallbackLibraryPath = @"DYLD_FALLBACK_LIBRARY_PATH=\"${WINESKIN_LIB_PATH_FOR_FALLBACK}\"";

NSString *wineBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineName];
NSString *wine64Bash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wine64Bash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wine64Name];
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineServerName];

[wineBash writeToFile:[NSString stringWithFormat:@"%@/wine",pathToWineBinFolder] atomically:YES encoding:NSUTF8StringEncoding];
Expand Down Expand Up @@ -1720,9 +1720,9 @@ - (void)fixWineStagingExecutableNames
NSString* binBash = @"#!/bin/bash\n";
NSString* dyldFallbackLibraryPath = @"DYLD_FALLBACK_LIBRARY_PATH=\"${WINESKIN_LIB_PATH_FOR_FALLBACK}\"";

NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineStagingName];
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineServerName];

//write out bash scripts to launch wine
Expand Down Expand Up @@ -1811,11 +1811,11 @@ - (void)fixWineStaging64ExecutableNames
NSString* binBash = @"#!/bin/bash\n";
NSString* dyldFallbackLibraryPath = @"DYLD_FALLBACK_LIBRARY_PATH=\"${WINESKIN_LIB_PATH_FOR_FALLBACK}\"";

NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineStagingName];
NSString *wineStaging64Bash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineStaging64Bash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineStaging64Name];
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineServerName];


Expand Down Expand Up @@ -1904,12 +1904,12 @@ - (void)fixWine32on64ExecutableNames
NSString* binBash = @"#!/bin/bash\n";
NSString* dyldFallbackLibraryPath = @"DYLD_FALLBACK_LIBRARY_PATH=\"${WINESKIN_LIB_PATH_FOR_FALLBACK}\"";

NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineStagingName];
NSString *wine32on64Bash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wine32on64Bash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wine32on64Name];

NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineServerName];


Expand Down Expand Up @@ -2014,13 +2014,13 @@ - (void)fixWine32on64_64BitExecutableNames
NSString* binBash = @"#!/bin/bash\n";
NSString* dyldFallbackLibraryPath = @"DYLD_FALLBACK_LIBRARY_PATH=\"${WINESKIN_LIB_PATH_FOR_FALLBACK}\"";

NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineStagingBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineStagingName];
NSString *wine32on64Bash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wine32on64Bash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wine32on64Name];
NSString *wineStaging64Bash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineStaging64Bash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineStaging64Name];
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"$(dirname \"$0\")/%@\" \"$@\"",
NSString *wineServerBash = [NSString stringWithFormat:@"%@ %@ \"%@\" \"$@\"",
binBash,dyldFallbackLibraryPath,wineServerName];


Expand Down

1 comment on commit 88bbea0

@Gcenx
Copy link
Collaborator Author

@Gcenx Gcenx commented on 88bbea0 Jan 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should still be dropped later but could be useful for the moment to help test builds without the need to notarize.

Please sign in to comment.