Skip to content

Commit

Permalink
Force Splintermind v20.5 due to 20.6 requiring Qt5. Fixes issue andre…
Browse files Browse the repository at this point in the history
…wd18#23. Revbump to 0.3.1.
  • Loading branch information
andrewd18 committed Oct 4, 2013
1 parent b722457 commit 42cec5e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Included Mods
* DF Hack 0.34.11-r3
* Falconne's DFHack UI Plugins v0.36
* SoundSense r42 (app only)
* Dwarf Therapist (splintermind, pulled and built from source)
* Dwarf Therapist v20.5 (splintermind, pulled and built from source)
* Tilesets
- [12x12] Jolly Bastion 34.10v5
- [16x16] ASCII Default 0.34.11
Expand Down
11 changes: 8 additions & 3 deletions df-lnp-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,11 @@ download_dwarf_therapist () {
local DWARF_THERAPIST_HG_DIR="$DOWNLOAD_DIR/dwarftherapist"
local SPLINTERMIND_REPO_URL="https://code.google.com/r/splintermind-attributes/"

# WORKAROUND:
# Force a checkout of revision 20.5 because 20.6 uses Qt5.
# Resolves issue #23.
local REV_20_5="4ef8173a7a94"

# Check for and fix the issue I had in 0.2.0 where I used the wrong upstream URL.
# Get the current upstream url. If the directory doesn't exist the var will contain "".
local CURRENT_UPSTREAM_URL="$(hg paths --cwd $DWARF_THERAPIST_HG_DIR | grep default | cut -d" " -f3)"
Expand All @@ -413,10 +418,10 @@ download_dwarf_therapist () {
fi

# Reclone.
hg clone "$SPLINTERMIND_REPO_URL" "$DWARF_THERAPIST_HG_DIR"
hg clone -r "$REV_20_5" "$SPLINTERMIND_REPO_URL" "$DWARF_THERAPIST_HG_DIR"
else
# URL is good; just get the latest changes.
hg update --cwd "$DWARF_THERAPIST_HG_DIR"
hg update -r "$REV_20_5" --cwd "$DWARF_THERAPIST_HG_DIR"
fi

# Quit if downloading failed.
Expand Down Expand Up @@ -1280,7 +1285,7 @@ restore_soundsense_packs () {
##############

# Globals.
VERSION="0.3.0"
VERSION="0.3.1"
DOWNLOAD_DIR="./downloads"
BACKUP_DIR="./df_backup"

Expand Down

0 comments on commit 42cec5e

Please sign in to comment.