[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum] script: Fix path of kphotoalbumui.rc in kpa-backup.sh
From:       Johannes Zarl-Zierl <null () kde ! org>
Date:       2016-12-31 17:03:32
Message-ID: E1cNN48-0003jQ-MJ () code ! kde ! org
[Download RAW message or body]

Git commit ecbf131d0696105380e105961b68e824c3e0bc36 by Johannes Zarl-Zierl.
Committed on 31/12/2016 at 17:02.
Pushed by johanneszarl into branch 'master'.

Fix path of kphotoalbumui.rc in kpa-backup.sh

M  +6    -1    script/kpa-backup.sh

https://commits.kde.org/kphotoalbum/ecbf131d0696105380e105961b68e824c3e0bc36

diff --git a/script/kpa-backup.sh b/script/kpa-backup.sh
index 76ac7e73..84bc84d2 100755
--- a/script/kpa-backup.sh
+++ b/script/kpa-backup.sh
@@ -31,7 +31,12 @@ fi
 
 # default locations:
 KPARC=`$QTPATHS --locate-file ConfigLocation kphotoalbumrc`
-KPAUIRC=`$QTPATHS --locate-file GenericDataLocation kphotoalbum/kphotoalbumui.rc`
+KPAUIRC=`$QTPATHS --locate-file GenericDataLocation kxmlgui5/kphotoalbum/kphotoalbumui.rc`
+if [ -z "$KPAUIRC" ]
+then
+	echo "Info: using old location for ui.rc files..." >&2
+	KPAUIRC=`$QTPATHS --locate-file GenericDataLocation kphotoalbum/kphotoalbumui.rc`
+fi
 BACKUP_LOCATION=~/kpa-backup
 BACKUP_ID=latest
 ACTION=
[prev in list] [next in list] [prev in thread] [next in thread]