Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KSP-CKAN/CKAN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5853e3ffb238
Choose a base ref
...
head repository: KSP-CKAN/CKAN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 567fd177d9ac
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 27, 2018

  1. Simplify path handling, add Mono 5 path, alert on errors

    @HebaruSan
    HebaruSan committed Feb 27, 2018
    Copy the full SHA
    a523648 View commit details

Commits on Mar 4, 2018

  1. Merge #2329 Improve CKAN.app launch script

    @politas
    politas committed Mar 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    politas Myk
    GPG key ID: 47938AAEAD85818F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    567fd17 View commit details
Showing with 31 additions and 16 deletions.
  1. +5 −0 CHANGELOG.md
  2. +24 −14 macosx/CKAN
  3. +2 −2 macosx/Makefile
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,11 @@ All notable changes to this project will be documented in this file.
- [Core] Fix ArgumentOutOfRangeException when removing files from game root (#2332 by: HebaruSan; reviewed: politas)
- [Core] Obey version properties of conflicts and depends relationships in sanity checks (#2339 by: HebaruSan; reviewed: politas)

### Internal

- [Build] Improve CKAN.app launch script (#2329 by: HebaruSan; reviewed: politas)


## v1.24.0 (Bruce)

### Features
38 changes: 24 additions & 14 deletions macosx/CKAN
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
#!/bin/sh
#!/bin/bash

# Check El Capitan's mono install location
PATH="$PATH":/usr/local/bin
# Check El Capitan's Mono install location
# And Mono 5's install location
# And the configured location in /etc/paths.d
MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
PATH="${PATH}:/usr/local/bin:${MONO_FRAMEWORK_PATH}/Commands"
if [ -r /etc/paths.d/mono-commands ]
then
PATH="${PATH}:$(cat /etc/paths.d/mono-commands)"
fi
export PATH

# Look for mono now that we've assembled our PATH
MONO=$(which mono)

if [ -z "$MONO" -o ! -x "$MONO" ]
then
# We could not find mono. The wiki explains how to install.
open 'https://github.com/KSP-CKAN/CKAN/wiki/Installing-CKAN-on-OSX'
# We could not find mono. The wiki explains how to install.
open 'https://github.com/KSP-CKAN/CKAN/wiki/Installing-CKAN-on-OSX'
else
# Mono found, so we can run CKAN.
# Fetch the path relative to the launch point where this shell script exists. (taken from Tasque & macpack)
APP_PATH=$(echo $0 | awk '{split($0,patharr,"/"); idx=1; while(patharr[idx+3] != "") { if (patharr[idx] != "/") {printf("%s/", patharr[idx]); idx++ }} }')
ASSEMBLY=ckan.exe
MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
export DYLD_FALLBACK_LIBRARY_PATH=$APP_PATH/Contents/MacOS:$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib

cd "$APP_PATH/Contents/MacOS"
exec -a "CKAN" "$MONO" --arch=32 $ASSEMBLY $@
# Mono found, so we can run CKAN
# The exe is called ckan.exe
ASSEMBLY=ckan.exe
# The script and ckan.exe are in the same folder, go there now
MACOS_PATH="$(cd "$(dirname "$0")" && pwd)"
cd "$MACOS_PATH"
# Set up and run mono
export MONO_MWF_USE_CARBON_BACKEND=1
export GDIPLUS_NOX=1
export DYLD_FALLBACK_LIBRARY_PATH="$MACOS_PATH:$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib"
"$MONO" --arch=32 "$ASSEMBLY" "$@"
fi
4 changes: 2 additions & 2 deletions macosx/Makefile
View file
Original file line number Diff line number Diff line change
@@ -31,11 +31,11 @@ $(EXESRC):

$(SCRIPTDEST): $(SCRIPTSRC)
mkdir -p $(shell dirname $@)
cp -l $< $@
cp -l -f $< $@

$(ICNSDEST): $(ICNSSRC)
mkdir -p $(shell dirname $@)
cp -l $< $@
cp -l -f $< $@

$(PLISTDEST): $(PLISTSRC)
mkdir -p $(shell dirname $@)