Merge branch 'feature/fix_desktop_toggle_writable_blocking_desktop_deletion' into 'master'

Fix desktop_toggle_writable blocking desktop deletion

See merge request os2borgerpc/os2borgerpc-scripts!180

Author: Andreas Poulsen

.gitlab-ci.yml

@@ -46,6 +46,6 @@ Lint python scripts:
   image: python:3.10-alpine
   before_script:
     - apk add --no-cache --virtual .deps gcc musl-dev
-    - pip install black
+    - pip install black==22.12.0
   script:
     - black --check --diff --exclude=migrations .

os2borgerpc/desktop/desktop_toggle_writable.sh

@@ -40,7 +40,7 @@ make_desktop_writable
 
 if [ "$ACTIVATE" = 'True' ]; then
 	# Temporarily set it mutable before copying new files in, as otherwise that will fail
-	sed -i "/# Restore \$HOME/a\ $SET_USER_DESKTOP_MUTABLE" $USER_CLEANUP
+	sed -i "/USERNAME=\"user\"/a $SET_USER_DESKTOP_MUTABLE" $USER_CLEANUP
 	cat <<- EOF >> $USER_CLEANUP
 		$SET_USER_DESKTOP_ROOT_OWNED
 		$SET_USER_DESKTOP_IMMUTABLE