diff --git a/build-grass.sh b/build-grass.sh index 3a7499f..e1953b8 100755 --- a/build-grass.sh +++ b/build-grass.sh @@ -162,7 +162,11 @@ function make_app_bundle_dir () { "$macos_dir/build_gui_user_menu.sh" cp -p "$GRASSDIR/macosx/app/build_html_user_index.sh" \ "$macos_dir/build_html_user_index.sh" - cp -p "$THIS_SCRIPT_DIR/files/Grass" "$macos_dir/GRASS" + if [ "$GRASS_VERSION" = "7.9.dev" ]; then + cp -p "$THIS_SCRIPT_DIR/files/Grass-7.9.dev" "$macos_dir/GRASS" + else + cp -p "$THIS_SCRIPT_DIR/files/Grass" "$macos_dir/GRASS" + fi cp -p "$GRASSDIR/macosx/app/AppIcon.icns" "$resources_dir/AppIcon.icns" cp -p "$GRASSDIR/macosx/app/GRASSDocument_gxw.icns" \ "$resources_dir/GRASSDocument_gxw.icns" diff --git a/files/Grass-7.9.dev b/files/Grass-7.9.dev new file mode 100755 index 0000000..c88c54a --- /dev/null +++ b/files/Grass-7.9.dev @@ -0,0 +1,61 @@ +#!/bin/sh + +# Opens a new Terminal window + +script_dir=$(dirname "$(dirname "$0")") + +shell=$SHELL + +# Set and check language code against 'locale'. Failed check will fallback +# using English (US) as default. +language=$(defaults read -g AppleLanguages | \ + awk -F'"' '{print $2}' | sed '/^$/d;s/-/_/') +language=$(echo ${language} | cut -d \ -f 1).UTF-8 + +LOCALE=`which locale` +if [ "$LOCALE" = "" ]; then + language="en_US.UTF-8" +else + locale_exists=$("$LOCALE" -a | grep -c "$language") + if [ "$locale_exists" -eq 0 ]; then + language="en_US.UTF-8" + fi +fi + +python_app="$script_dir/Resources/bin/python.app" +wx_setting_file="$HOME/.grass7/wx.json" +startWithoutShell=$( +$python_app - < /dev/null 2>&1 &" +EOF +else + osascript <