diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-02-12 00:17:53 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-02-14 01:07:37 +0900 |
| commit | f9f7aee79eecdb610d71a8f2703de43e90018e5b (patch) | |
| tree | dbb7075651157c6fad1d0aa027b503c95b5aa2e7 /r14-xdg-update | |
| parent | f1df18afb54fd214430a2eb8416f632ffb8c64d1 (diff) | |
| download | tdebase-f9f7aee79eecdb610d71a8f2703de43e90018e5b.tar.gz tdebase-f9f7aee79eecdb610d71a8f2703de43e90018e5b.zip | |
Removed HAL dependant code.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'r14-xdg-update')
| -rw-r--r-- | r14-xdg-update | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/r14-xdg-update b/r14-xdg-update index fc7b2c20f..623e69606 100644 --- a/r14-xdg-update +++ b/r14-xdg-update @@ -3,7 +3,7 @@ # A script to perform R14.0.0 XDG compliance updates. SCRIPT_NAME="$(basename -- "$0")" -SCRIPT_VERSION=202103280 +SCRIPT_VERSION=202202130 # This script should be needed to run only once, but corner cases # and file/directory permissions could cause incomplete updates. @@ -824,15 +824,14 @@ if [ "$R14_VERSION" -lt "201401070" ]; then mv $PROFILE_DIR/share/apps/kstyle $PROFILE_DIR/share/apps/tdestyle 2>/dev/null fi fi -if [ "$R14_VERSION" -lt "201309150" ]; then - # Copy the following two rc files rather than move because the older versions are needed for HAL systems. +if [ "$R14_VERSION" -lt "202202130" ]; then if [ ! -f $PROFILE_DIR/share/config/tdenetworkmanagerrc ] && [ -f $PROFILE_DIR/share/config/knetworkmanagerrc ]; then Log " knetworkmanager->tdenetworkmanager" - cp -a $PROFILE_DIR/share/config/knetworkmanagerrc $PROFILE_DIR/share/config/tdenetworkmanagerrc 2>/dev/null + mv $PROFILE_DIR/share/config/knetworkmanagerrc $PROFILE_DIR/share/config/tdenetworkmanagerrc 2>/dev/null fi if [ ! -f $PROFILE_DIR/share/config/tdepowersaverc ] && [ -f $PROFILE_DIR/share/config/kpowersaverc ]; then Log " kpowersave->tdepowersave" - cp -a $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null + mv $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null fi fi if [ "$R14_VERSION" -lt "201401050" ]; then |