diff options
| author | Darrell Anderson <[email protected]> | 2014-06-21 21:58:22 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-06-21 21:58:22 +0900 |
| commit | 4eac9afd04cd0f7d666dfcf3ba80297c047df7bf (patch) | |
| tree | 29ff990eb50c1c2dd0f85d5811be44e36466a509 | |
| parent | 2dca370ec5f79615504d5ef36946f7d0b64a002e (diff) | |
| download | tdebase-4eac9afd04cd0f7d666dfcf3ba80297c047df7bf.tar.gz tdebase-4eac9afd04cd0f7d666dfcf3ba80297c047df7bf.zip | |
Added /usr/local/share in XDG_DATA_DIRS in starttde. This resolves bug 2069.
| -rwxr-xr-x[-rw-r--r--] | starttde | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/starttde b/starttde index 5e4a0db00..3c58dd21a 100644..100755 --- a/starttde +++ b/starttde @@ -251,14 +251,14 @@ fi # set in $TDEDIRS are intended to override data files found in $TDEDIR. Those additional # directories should be placed before $TDEDIR and before /usr/share. if [ "$TDEDIR" != "/usr" ] && [ -d $TDEDIR/share ]; then - # If '/usr/share' is not already here, we include it at the last position. - if ! is_in_path XDG_DATA_DIRS "/usr/share"; then - XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share - fi + # Make sure '/usr/local/share' and '/usr/share' are included in that order at the end + remove_from_path XDG_DATA_DIRS "/usr/share" + remove_from_path XDG_DATA_DIRS "/usr/local/share" + XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/local/share:/usr/share - # Ensure that $TDEDIR/share is always before '/usr/share'. + # Ensure that $TDEDIR/share is always before '/usr/local/share'. remove_from_path XDG_DATA_DIRS $TDEDIR/share - place_before_in_path XDG_DATA_DIRS "$TDEDIR/share" "/usr/share" + place_before_in_path XDG_DATA_DIRS "$TDEDIR/share" "/usr/local/share" # Adds supplementary directories from TDEDIRS, if any, before TDEDIR. if [ "$TDEDIRS" != "" ]; then |