summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2013-03-05 00:00:41 -0600
committerDarrell Anderson <[email protected]>2013-03-05 00:00:41 -0600
commitc1efd165b4b854bf88c5213fed0c0adc581ae207 (patch)
tree204d23932ddc73615e34f53332d69e62e195aa5e
parentf5cb5c63242920cd1da8e38c39686c11ec70517f (diff)
downloadtdebase-c1efd165b4b854bf88c5213fed0c0adc581ae207.tar.gz
tdebase-c1efd165b4b854bf88c5213fed0c0adc581ae207.zip
Fix error messages.
-rw-r--r--r14-xdg-update8
1 files changed, 5 insertions, 3 deletions
diff --git a/r14-xdg-update b/r14-xdg-update
index de395e87f..a9b7c5cc0 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -429,8 +429,10 @@ if [ -d "$PROFILE_DIR/Autostart" ]; then
if [ -n "`echo $LINK_PATH | grep \"$TDEDIR/share/applications/kde\"`" ]; then
NEW_LINK_PATH="`echo \"$LINK_PATH\" | sed 's|/share/applications/kde|/share/applications/tde|'`"
fi
- unlink $i
- ln -sf "$NEW_LINK_PATH/$LINK_NAME" "$LINK_NAME"
+ if [ "$NEW_LINK_PATH" != "" ]; then
+ unlink $i
+ ln -sf "$NEW_LINK_PATH/$LINK_NAME" "$LINK_NAME"
+ fi
if [ "$?" != "0" ]; then
Message_Prefix
echo "There was an error with creating a new sym link for $LINK." 1>&2
@@ -453,7 +455,7 @@ fi
# performed in the migratekde3 script, but notice the migratekde3 script uses the key of
# X-KDE-Kded-autoload whereas X-TDE-Kded-autoload is used here.
if [ -d $PROFILE_DIR/share/services/kded ]; then
- if [ "`find $PROFILE_DIR/share/services/kded -name *.desktop`" != "" ]; then
+ if [ "`find $PROFILE_DIR/share/services/kded -name \"*.desktop\"`" != "" ]; then
Message_Prefix
echo "Validating KDED services."
for i in `/bin/ls -1 $PROFILE_DIR/share/services/kded/*.desktop`; do