forked from finn/tinyboard
add sleep to prevent rclone before fuse mod, and add performance caching
This commit is contained in:
@@ -13,8 +13,15 @@ NC='\033[0m'
|
|||||||
|
|
||||||
info() { echo -e "${GREEN}[+]${NC} $*"; }
|
info() { echo -e "${GREEN}[+]${NC} $*"; }
|
||||||
warn() { echo -e "${YELLOW}[!]${NC} $*"; }
|
warn() { echo -e "${YELLOW}[!]${NC} $*"; }
|
||||||
die() { echo -e "${RED}[ERROR]${NC} $*" >&2; exit 1; }
|
die() {
|
||||||
header() { echo -e "\n${CYAN}══════════════════════════════════════════${NC}"; echo -e "${CYAN} $*${NC}"; echo -e "${CYAN}══════════════════════════════════════════${NC}"; }
|
echo -e "${RED}[ERROR]${NC} $*" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
header() {
|
||||||
|
echo -e "\n${CYAN}══════════════════════════════════════════${NC}"
|
||||||
|
echo -e "${CYAN} $*${NC}"
|
||||||
|
echo -e "${CYAN}══════════════════════════════════════════${NC}"
|
||||||
|
}
|
||||||
|
|
||||||
check_deps() {
|
check_deps() {
|
||||||
local missing=()
|
local missing=()
|
||||||
@@ -155,7 +162,10 @@ if [[ "${ADD_UNION,,}" == "y" ]]; then
|
|||||||
1) UPSTREAM_TAG=":ro" ;;
|
1) UPSTREAM_TAG=":ro" ;;
|
||||||
2) UPSTREAM_TAG=":nc" ;;
|
2) UPSTREAM_TAG=":nc" ;;
|
||||||
3) UPSTREAM_TAG=":writeback" ;;
|
3) UPSTREAM_TAG=":writeback" ;;
|
||||||
*) warn "Invalid choice, defaulting to full read/write."; UPSTREAM_TAG="" ;;
|
*)
|
||||||
|
warn "Invalid choice, defaulting to full read/write."
|
||||||
|
UPSTREAM_TAG=""
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
if [ -n "$UNION_PATH" ]; then
|
if [ -n "$UNION_PATH" ]; then
|
||||||
UPSTREAM="${SPOKE_NAME}-remote:${UNION_PATH}${UPSTREAM_TAG}"
|
UPSTREAM="${SPOKE_NAME}-remote:${UNION_PATH}${UPSTREAM_TAG}"
|
||||||
@@ -163,7 +173,8 @@ if [[ "${ADD_UNION,,}" == "y" ]]; then
|
|||||||
UPSTREAM="${SPOKE_NAME}-remote:${UPSTREAM_TAG}"
|
UPSTREAM="${SPOKE_NAME}-remote:${UPSTREAM_TAG}"
|
||||||
fi
|
fi
|
||||||
if grep -q "^\[${UNION_NAME}\]" "$RCLONE_CONF" 2>/dev/null; then
|
if grep -q "^\[${UNION_NAME}\]" "$RCLONE_CONF" 2>/dev/null; then
|
||||||
ALREADY=$(python3 - "$RCLONE_CONF" "$UNION_NAME" "${SPOKE_NAME}-remote:" <<'PYEOF2'
|
ALREADY=$(
|
||||||
|
python3 - "$RCLONE_CONF" "$UNION_NAME" "${SPOKE_NAME}-remote:" <<'PYEOF2'
|
||||||
import sys
|
import sys
|
||||||
path, section, prefix = sys.argv[1], sys.argv[2], sys.argv[3]
|
path, section, prefix = sys.argv[1], sys.argv[2], sys.argv[3]
|
||||||
with open(path) as f:
|
with open(path) as f:
|
||||||
@@ -230,7 +241,8 @@ echo "${SPOKE_NAME} ${TUNNEL_PORT} ${KEY_PATH} ${MOUNT_POINT}" >> "$REGISTRY"
|
|||||||
info "$SPOKE_NAME registered."
|
info "$SPOKE_NAME registered."
|
||||||
|
|
||||||
header "Setting Up Auto-Mount"
|
header "Setting Up Auto-Mount"
|
||||||
MOUNT_CMD="rclone mount ${SPOKE_NAME}-remote: ${MOUNT_POINT} --config ${HOME}/.config/rclone/rclone.conf --vfs-cache-mode writes --allow-other --daemon"
|
#MOUNT_CMD="rclone mount ${SPOKE_NAME}-remote: ${MOUNT_POINT} --config ${HOME}/.config/rclone/rclone.conf --vfs-cache-mode writes --allow-other --daemon"
|
||||||
|
MOUNT_CMD="sleep 55 && rclone mount ${SPOKE_NAME}-remote: ${MOUNT_POINT} --config ${HOME}/.config/rclone/rclone.conf --vfs-cache-mode full --vfs-cache-max-size 2G --vfs-read-ahead 256M --allow-other --daemon"
|
||||||
CRON_ENTRY="@reboot ${MOUNT_CMD}"
|
CRON_ENTRY="@reboot ${MOUNT_CMD}"
|
||||||
EXISTING=$(crontab -l 2>/dev/null || true)
|
EXISTING=$(crontab -l 2>/dev/null || true)
|
||||||
if echo "$EXISTING" | grep -qF "${SPOKE_NAME}-remote:"; then
|
if echo "$EXISTING" | grep -qF "${SPOKE_NAME}-remote:"; then
|
||||||
@@ -240,7 +252,10 @@ else
|
|||||||
mkdir -p "$(dirname "$CRONTAB_BACKUP")"
|
mkdir -p "$(dirname "$CRONTAB_BACKUP")"
|
||||||
echo "$EXISTING" >"$CRONTAB_BACKUP"
|
echo "$EXISTING" >"$CRONTAB_BACKUP"
|
||||||
info "Crontab backed up to $CRONTAB_BACKUP"
|
info "Crontab backed up to $CRONTAB_BACKUP"
|
||||||
{ echo "$EXISTING"; echo "$CRON_ENTRY"; } | crontab -
|
{
|
||||||
|
echo "$EXISTING"
|
||||||
|
echo "$CRON_ENTRY"
|
||||||
|
} | crontab -
|
||||||
info "Auto-mount crontab entry added for ${SPOKE_NAME}."
|
info "Auto-mount crontab entry added for ${SPOKE_NAME}."
|
||||||
fi
|
fi
|
||||||
info "Starting mount now..."
|
info "Starting mount now..."
|
||||||
|
|||||||
Reference in New Issue
Block a user