diff options
| author | Wolfgang Schupp <w.schupp@a1.net> | 2018-09-26 11:24:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 11:24:58 +0200 |
| commit | fccf13b440fe4de676558bac3080fe46b6dc4ca1 (patch) | |
| tree | 1f2f2dda05ce15c892990e418615b4d5a7348cb6 /tools/Linux | |
| parent | 5ebfdb4ed8e172c9fb3966dfdabeccf216e59724 (diff) | |
| parent | ca76a74490eda3977ab430975c846ea9841c8883 (diff) | |
Merge pull request #14460 from wsnipex/userdata_dir
[linux] allow overriding the userdata dir
Diffstat (limited to 'tools/Linux')
| -rw-r--r-- | tools/Linux/kodi.sh.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in index a16b448984..4b2b6a7476 100644 --- a/tools/Linux/kodi.sh.in +++ b/tools/Linux/kodi.sh.in @@ -27,7 +27,7 @@ datarootdir="@datarootdir@" LIBDIR="@libdir@" APP_BINARY=$LIBDIR/${bin_name}/@APP_BINARY@ CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME} -USERDATA_DIR="${HOME}/.${bin_name}" +KODI_DATA=${KODI_DATA:-"${HOME}/.${bin_name}"} # mapped to special://home/ WINDOWING=${WINDOWING:-"auto"} # Workaround for high CPU load with nvidia GFX @@ -90,10 +90,10 @@ migrate_home() [ "$(basename $0)" = "xbmc" ] && echo "WARNING: Running ${bin_name} as "xbmc" is deprecated and will be removed in later versions, please switch to using the ${bin_name} binary" #check if data migration is needed - if [ -d "${HOME}/.xbmc" ] && [ ! -d "${USERDATA_DIR}" ]; then - echo "INFO: migrating userdata folder. Renaming ${HOME}/.xbmc to $USERDATA_DIR" - mv ${HOME}/.xbmc $USERDATA_DIR - touch ${USERDATA_DIR}/.kodi_data_was_migrated + if [ -d "${HOME}/.xbmc" ] && [ ! -d "${KODI_DATA}" ]; then + echo "INFO: migrating userdata folder. Renaming ${HOME}/.xbmc to $KODI_DATA" + mv ${HOME}/.xbmc $KODI_DATA + touch ${KODI_DATA}/.kodi_data_was_migrated fi } @@ -176,9 +176,9 @@ print_crash_report() echo >> $FILE echo "################# LOG FILE ##################" >> $FILE echo >> $FILE - if [ -f $USERDATA_DIR/temp/@APP_NAME_LC@.log ] + if [ -f $KODI_DATA/temp/@APP_NAME_LC@.log ] then - cat $USERDATA_DIR/temp/@APP_NAME_LC@.log >> $FILE + cat $KODI_DATA/temp/@APP_NAME_LC@.log >> $FILE echo >> $FILE else echo "Logfile not found in the usual place." >> $FILE |