cleanup the correct path

diff --git a/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon b/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
index c803253a8507b910f40d0bc2b39170cd2173a034..ff4e080059079ad88f4a1d66e8652afb2f8560dd 100755 (executable)
--- a/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
+++ b/dist-google-more/cm-data/99-perso-google-clean-more.sh.addon
@@ -38,7 +38,7 @@ case "$1" in
   ;;
   post-restore)
     # remove google bloat from pico opengapps
-    rm -rf $S/app/GoogleContactsSyncAdapter
-    rm -rf $S/app/GoogleCalendarSyncAdapter
+    rm -rf $SYS/app/GoogleContactsSyncAdapter
+    rm -rf $SYS/app/GoogleCalendarSyncAdapter
   ;;
 esac

diff --git a/dist-google/cm-data/99-perso-google-clean.sh.addon b/dist-google/cm-data/99-perso-google-clean.sh.addon
index cb598e4e2f2afa01bad6b6a27954cc90b6fa93f8..bdf3fdec2b566a90664167afa31b211091698915 100755 (executable)
--- a/dist-google/cm-data/99-perso-google-clean.sh.addon
+++ b/dist-google/cm-data/99-perso-google-clean.sh.addon
@@ -38,14 +38,14 @@ case "$1" in
   ;;
   post-restore)
     # remove google bloat from pico opengapps
-    rm -rf $S/priv-app/GoogleBackupTransport
-    rm -rf $S/priv-app/GoogleFeedback
-    rm -rf $S/priv-app/GooglePartnerSetup
-    rm -rf $S/priv-app/GooglePackageInstaller
-    #rm -rf $S/priv-app/SetupWizard
-    #rm -rf $S/app/GoogleTTS
-    rm -rf $S/app/SoundPickerPrebuilt
-    rm -f $S/etc/permissions/com.google.android.dialer.support.xml
-    rm -f $S/framework/com.google.android.dialer.support.jar
+    rm -rf $SYS/priv-app/GoogleBackupTransport
+    rm -rf $SYS/priv-app/GoogleFeedback
+    rm -rf $SYS/priv-app/GooglePartnerSetup
+    rm -rf $SYS/priv-app/GooglePackageInstaller
+    #rm -rf $SYS/priv-app/SetupWizard
+    #rm -rf $SYS/app/GoogleTTS
+    rm -rf $SYS/app/SoundPickerPrebuilt
+    rm -f $SYS/etc/permissions/com.google.android.dialer.support.xml
+    rm -f $SYS/framework/com.google.android.dialer.support.jar
   ;;
 esac

diff --git a/dist-std/cm-data/99-perso.sh.addon b/dist-std/cm-data/99-perso.sh.addon
index 6513486597b827943aa43b33260594a5fc9ad41a..7dbeca22b770cc9ba1daeaab76c44e9c9c9ac67b 100755 (executable)
--- a/dist-std/cm-data/99-perso.sh.addon
+++ b/dist-std/cm-data/99-perso.sh.addon
@@ -50,69 +50,69 @@ case "$1" in
   ;;
   post-restore)
     # mute camera
-    chmod 000 $S/media/audio/ui/camera_*.ogg
+    chmod 000 $SYS/media/audio/ui/camera_*.ogg
     # remove bloat
-    rm -rf $S/priv-app/AudioFX
-    rm -rf $S/priv-app/CMAccount
-    rm -rf $S/priv-app/CMBugReport
-    rm -rf $S/priv-app/CMUpdater
-    #rm -rf $S/priv-app/Updater
-    rm -rf $S/priv-app/LiveLockScreenService
-    rm -rf $S/priv-app/Snap
-    rm -rf $S/priv-app/ThemeChooser
-    rm -rf $S/priv-app/ThemesProvider
-    rm -rf $S/priv-app/Trebuchet
-    rm -rf $S/priv-app/TrebuchetQuickStep
-    rm -rf $S/app/BasicDreams
-    rm -rf $S/app/CMWallpapers
-    rm -rf $S/app/Camera2
-    rm -rf $S/app/Email
-    rm -rf $S/app/Exchange2
-    rm -rf $S/app/Galaxy4
-    rm -rf $S/app/HoloSpiralWallpaper
-    rm -rf $S/app/HexoLibre
-    rm -rf $S/app/Jelly
-    rm -rf $S/app/LiveWallpapers
-    rm -rf $S/app/LiveWallpapersPicker
-    rm -rf $S/app/LockClock
-    rm -rf $S/app/NoiseField
-    rm -rf $S/app/PhaseBeam
-    rm -rf $S/app/PhotoPhase
-    rm -rf $S/app/PhotoTable
-    rm -rf $S/app/Profiles
-    rm -rf $S/app/Stk
-    rm -rf $S/app/Terminal
-    rm -rf $S/app/TimeService
-    rm -rf $S/app/VisualizationWallpapers
-    rm -rf $S/app/WAPPushManager
-    rm -rf $S/app/WhisperPush
+    rm -rf $SYS/priv-app/AudioFX
+    rm -rf $SYS/priv-app/CMAccount
+    rm -rf $SYS/priv-app/CMBugReport
+    rm -rf $SYS/priv-app/CMUpdater
+    #rm -rf $SYS/priv-app/Updater
+    rm -rf $SYS/priv-app/LiveLockScreenService
+    rm -rf $SYS/priv-app/Snap
+    rm -rf $SYS/priv-app/ThemeChooser
+    rm -rf $SYS/priv-app/ThemesProvider
+    rm -rf $SYS/priv-app/Trebuchet
+    rm -rf $SYS/priv-app/TrebuchetQuickStep
+    rm -rf $SYS/app/BasicDreams
+    rm -rf $SYS/app/CMWallpapers
+    rm -rf $SYS/app/Camera2
+    rm -rf $SYS/app/Email
+    rm -rf $SYS/app/Exchange2
+    rm -rf $SYS/app/Galaxy4
+    rm -rf $SYS/app/HoloSpiralWallpaper
+    rm -rf $SYS/app/HexoLibre
+    rm -rf $SYS/app/Jelly
+    rm -rf $SYS/app/LiveWallpapers
+    rm -rf $SYS/app/LiveWallpapersPicker
+    rm -rf $SYS/app/LockClock
+    rm -rf $SYS/app/NoiseField
+    rm -rf $SYS/app/PhaseBeam
+    rm -rf $SYS/app/PhotoPhase
+    rm -rf $SYS/app/PhotoTable
+    rm -rf $SYS/app/Profiles
+    rm -rf $SYS/app/Stk
+    rm -rf $SYS/app/Terminal
+    rm -rf $SYS/app/TimeService
+    rm -rf $SYS/app/VisualizationWallpapers
+    rm -rf $SYS/app/WAPPushManager
+    rm -rf $SYS/app/WhisperPush
     # omnirom
-    rm -rf $S/priv-app/Launcher3
-    rm -rf $S/priv-app/OmniBrain
-    rm -rf $S/priv-app/OmniStyle
-    rm -rf $S/priv-app/OmniSwitch
-    rm -rf $S/priv-app/MatLog
-    rm -rf $S/priv-app/OpenDelta
-    rm -rf $S/app/OmniTorch
-    rm -rf $S/app/OmniJaws
-    rm -rf $S/app/OmniClockOSS
-    rm -rf $S/app/OmniChange
-    rm -rf $S/app/Chromium
-    rm -rf $S/app/MusicFX
-    rm -rf $S/app/EggGame
-    rm -rf $S/app/EasterEgg
-    rm -rf $S/app/MonthCalendarWidget
+    rm -rf $SYS/priv-app/Launcher3
+    rm -rf $SYS/priv-app/OmniBrain
+    rm -rf $SYS/priv-app/OmniStyle
+    rm -rf $SYS/priv-app/OmniSwitch
+    rm -rf $SYS/priv-app/MatLog
+    rm -rf $SYS/priv-app/OpenDelta
+    rm -rf $SYS/app/OmniTorch
+    rm -rf $SYS/app/OmniJaws
+    rm -rf $SYS/app/OmniClockOSS
+    rm -rf $SYS/app/OmniChange
+    rm -rf $SYS/app/Chromium
+    rm -rf $SYS/app/MusicFX
+    rm -rf $SYS/app/EggGame
+    rm -rf $SYS/app/EasterEgg
+    rm -rf $SYS/app/MonthCalendarWidget
     # omnirom sustratum stuff
-    rm -rf $S/overlay
+    rm -rf $SYS/overlay
     # arrow
-    rm -rf $S/priv-app/AsusCamera
-    rm -rf $S/priv-app/Camera2
-    rm -rf $S/priv-app/Launcher3QuickStep
-    rm -rf $S/app/Browser
-    rm -rf $S/app/Simple-Gallery
-    rm -rf $S/app/SoundPickerPrebuilt
-    rm -rf $S/vendor/app/DTVPlayer
-    rm -rf $S/vendor/app/DTVService
+    rm -rf $SYS/priv-app/AsusCamera
+    rm -rf $SYS/priv-app/Camera2
+    rm -rf $SYS/priv-app/Launcher3QuickStep
+    rm -rf $SYS/app/Browser
+    rm -rf $SYS/app/Simple-Gallery
+    rm -rf $SYS/app/SoundPickerPrebuilt
+    rm -rf $SYS/vendor/app/DTVPlayer
+    rm -rf $SYS/vendor/app/DTVService
     # Fix ownership/permissions
     for i in $(list_files); do
       chown root:root "$SYS/$i"