diff --git a/pull.lists.sh b/pull.lists.sh index 1179b7e..7a3d647 100755 --- a/pull.lists.sh +++ b/pull.lists.sh @@ -2,17 +2,17 @@ [[ -f set_env.sh ]] && source set_env.sh || { echo "set_env.sh not found"; exit 1; } # Mounting storage -if df | grep -c opendrive > /dev/null; then - umount "${HOME_DIR}/opendrive" || sudo umount "${HOME_DIR}/opendrive" +if df | grep -c dropbox > /dev/null; then + umount "${HOME_DIR}/dropbox" || sudo umount "${HOME_DIR}/dropbox" fi -if [[ -d "${HOME_DIR}/opendrive" ]]; then - rm -rf "${HOME_DIR}/opendrive" - mkdir "${HOME_DIR}/opendrive" +if [[ -d "${HOME_DIR}/dropbox" ]]; then + rm -rf "${HOME_DIR}/dropbox" + mkdir "${HOME_DIR}/dropbox" else - mkdir "${HOME_DIR}/opendrive" + mkdir "${HOME_DIR}/dropbox" fi -rclone mount --daemon opendrive:Public/blocklist/ "${HOME_DIR}/opendrive" --volname opendrive +rclone mount --daemon dropbox:blocklist "${HOME_DIR}/dropbox" --volname dropbox cd "${WRK_DIR}/" @@ -57,16 +57,16 @@ sleep 1 xz -v -T4 MyBlocklist.txt xz -v -T4 facebook_block.txt chmod 777 ./* -exit + #--------- # Moving to target echo "Moving blocklists to destination..." cd "${WRK_DIR}/" -rsync -a --progress blocklists/* "${HOME_DIR}/opendrive/" +rsync -a --progress blocklists/* "${HOME_DIR}/dropbox/" echo "Final clean up..." -umount "${HOME_DIR}/opendrive" || sudo umount "${HOME_DIR}/opendrive" -rm -rf "${HOME_DIR}/opendrive" +umount "${HOME_DIR}/dropbox" || sudo umount "${HOME_DIR}/dropbox" +rm -rf "${HOME_DIR}/dropbox" rm -rf "blocklists" echo "Done!" \ No newline at end of file