Merge branch 'master' of https://github.com/vector-im/riot-web into d…

…evelop

* 'master' of https://github.com/vector-im/riot-web:
  Fix cleanup script not to remove extracted/bundles directories (element-hq#8764)

scripts/cleanup.sh

@@ -9,8 +9,11 @@ live=`dirname $(readlink -f "$HOME/live")`
 # currently live bundle (just the name of the bundle)
 live_bundle=`grep 'script src="bundles' live/index.html | sed -e 's#.*bundles/##' -e 's#/.*##'`
 
-# clean up 'extracted': find things which are older than 7 days, exclude the current live one, and remove
-find $HOME/extracted -maxdepth 1 -type d -ctime +7 \! -path "$live" -exec rm -r {} \;
+# clean up 'extracted': find things which are older than 7 days, exclude the
+# current live one, and remove
+find $HOME/extracted -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -path "$live" -exec rm -r {} \;
 
 # clean up 'bundles': ditto
-find $HOME/bundles -maxdepth 1 -type d -ctime +7 \! -name "$live_bundle" -exec rm -r {} \;
+find $HOME/bundles -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -name "$live_bundle" -exec rm -r {} \;