From 367b92b596c78213850a23b04761574a142ed7ac Mon Sep 17 00:00:00 2001 From: MangoPig Date: Wed, 3 Dec 2025 14:40:48 +0000 Subject: [PATCH] Change --- Makefile | 6 +-- setup.sh | 2 +- rclone.sh => storagebox.sh | 76 +++++++++++++++++++++++--------------- 3 files changed, 50 insertions(+), 34 deletions(-) rename rclone.sh => storagebox.sh (54%) diff --git a/Makefile b/Makefile index cad5612..2866c92 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ setup: # Just stow the dotfiles stow: - stow . --target=$$HOME --ignore="setup.sh" --ignore=".git" --ignore=".gitignore" --ignore="README.md" --ignore=".zsh_secrets" --ignore=".zsh_secrets.example" --ignore="LICENSE" --ignore="Makefile" --ignore="provision.sh" --ignore="rclone.sh" + stow . --target=$$HOME --ignore="setup.sh" --ignore=".git" --ignore=".gitignore" --ignore="README.md" --ignore=".zsh_secrets" --ignore=".zsh_secrets.example" --ignore="LICENSE" --ignore="Makefile" --ignore="provision.sh" --ignore="storagebox.sh" @echo "Dotfiles linked." # Clean old files and links @@ -25,8 +25,8 @@ update: git pull origin main make setup -# rclone setup -rclone-setup: +# Setup StorageBox +storagebox: bash rclone.sh # Docker Tests diff --git a/setup.sh b/setup.sh index e81fe0e..e4b1162 100755 --- a/setup.sh +++ b/setup.sh @@ -220,7 +220,7 @@ touch "$HOME/.zsh_secrets" # Stow Dotfiles echo -e "${BLUE} LOG:${YELLOW} Stowing dotfiles...${NC}" cd "$DOTFILES_DIR" -stow . --target="$HOME" --ignore="setup.sh" --ignore=".git" --ignore=".gitignore" --ignore="README.md" --ignore=".zsh_secrets" --ignore=".zsh_secrets.example" --ignore="LICENSE" --ignore="Makefile" --ignore="provision.sh" --ignore="rclone.sh" +stow . --target="$HOME" --ignore="setup.sh" --ignore=".git" --ignore=".gitignore" --ignore="README.md" --ignore=".zsh_secrets" --ignore=".zsh_secrets.example" --ignore="LICENSE" --ignore="Makefile" --ignore="provision.sh" --ignore="storagebox.sh" # Language Setup echo -e "${BLUE} LOG:${YELLOW} Finalizing Language Setup...${NC}" diff --git a/rclone.sh b/storagebox.sh similarity index 54% rename from rclone.sh rename to storagebox.sh index 0e65ea7..9bd26ec 100644 --- a/rclone.sh +++ b/storagebox.sh @@ -11,39 +11,40 @@ NC='\033[0m' SECRETS_FILE="$HOME/.zsh_secrets" REMOTE_NAME="hetzner-box" -# 1. Dependency Check +# Dependency Check if ! command -v rclone &> /dev/null; then echo -e "${RED}Error: rclone is not installed.${NC}" - echo "Run: sudo pacman -S rclone (Arch) or sudo apt install rclone (Ubuntu)" exit 1 fi -# 2. Load Secrets +# Load Secrets if [ -f "$SECRETS_FILE" ]; then source "$SECRETS_FILE" fi -# 3. Configure Remote (If missing) +# Configure Remote (If missing) if ! rclone listremotes | grep -q "^${REMOTE_NAME}:$"; then echo -e "${BLUE}Configuration missing. Starting setup...${NC}" - # Prompt if variables are missing if [ -z "$HETZNER_USER" ]; then - HETZNER_USER="u513875" - read -p "Enter Storage Box Username (u123456): " HETZNER_USER + DEFAULT_USER="u513875" + read -p "Enter Username [$DEFAULT_USER]: " INPUT_USER + HETZNER_USER="${INPUT_USER:-$DEFAULT_USER}" fi + if [ -z "$HETZNER_HOST" ]; then - HETZNER_HOST="u513875.your-storagebox.de" - read -p "Enter Storage Box Host (u513875.your-storagebox.de): " HETZNER_HOST + DEFAULT_HOST="${HETZNER_USER}.your-storagebox.de" + read -p "Enter Host [$DEFAULT_HOST]: " INPUT_HOST + HETZNER_HOST="${INPUT_HOST:-$DEFAULT_HOST}" fi + if [ -z "$HETZNER_PASS" ]; then - HETZNER_PASS="" echo -e "${YELLOW}Note: Passwords are obscured in config, but saving to secrets file uses plain text.${NC}" - read -s -p "Enter Storage Box Password: " HETZNER_PASS + read -s -p "Enter Password: " HETZNER_PASS echo "" fi - # Save to secrets for future use + # Save to secrets if ! grep -q "HETZNER_USER" "$SECRETS_FILE" 2>/dev/null; then echo -e "${BLUE}Saving credentials to $SECRETS_FILE...${NC}" { @@ -55,7 +56,6 @@ if ! rclone listremotes | grep -q "^${REMOTE_NAME}:$"; then } >> "$SECRETS_FILE" fi - # Create Rclone Config (Obscure password first) OBSCURED_PASS=$(rclone obscure "$HETZNER_PASS") rclone config create "$REMOTE_NAME" sftp \ host "$HETZNER_HOST" \ @@ -67,47 +67,63 @@ if ! rclone listremotes | grep -q "^${REMOTE_NAME}:$"; then echo -e "${GREEN}Configuration created!${NC}" fi -# 4. Interactive Menu +# Interactive Menu echo -e "${BLUE}--- Hetzner Storage Box Manager ---${NC}" echo "1) List files (ls)" echo "2) Upload (Copy LOCAL -> REMOTE)" echo "3) Download (Copy REMOTE -> LOCAL)" -echo "4) Mount (Browse files)" +echo "4) Mount (Fast NVMe Cache)" echo "q) Quit" read -p "Select option: " OPTION case $OPTION in 1) - DEFAULT_DEPTH=2 - echo -e "${YELLOW}Listing files...${NC}" - read -p "Enter depth (default $DEFAULT_DEPTH): " DEFAULT_DEPTH - - rclone ls "${REMOTE_NAME}:" --max-depth "$DEFAULT_DEPTH" + read -p "Enter depth [2]: " INPUT_DEPTH + DEPTH="${INPUT_DEPTH:-2}" + rclone ls "${REMOTE_NAME}:" --max-depth "$DEPTH" ;; 2) - read -p "Enter local folder to upload from (e.g., $HOME/Documents): " LOCAL_FOLDER + read -p "Enter local folder to upload: " LOCAL_FOLDER LOCAL_FOLDER=${LOCAL_FOLDER%/} - - read -p "Enter remote folder name on Hetzner (e.g. Backup): " REMOTE_FOLDER + read -p "Enter remote folder name (e.g. Backup): " REMOTE_FOLDER echo -e "${YELLOW}Uploading (Copying)...${NC}" - rclone copy "$LOCAL_FOLDER" "${REMOTE_NAME}:/${REMOTE_FOLDER}" -P ;; 3) - read -p "Enter remote folder on Hetzner to download (e.g. Backup): " REMOTE_FOLDER - read -p "Enter local destination folder: " LOCAL_FOLDER + read -p "Enter remote folder to download: " REMOTE_FOLDER + read -p "Enter local destination: " LOCAL_FOLDER echo -e "${YELLOW}Downloading (Copying)...${NC}" rclone copy "${REMOTE_NAME}:/${REMOTE_FOLDER}" "$LOCAL_FOLDER" -P ;; 4) - MOUNT_POINT="/mnt/resources/storagebox" + if [ -d "/mnt/resource" ]; then + BASE_DIR="/mnt/resource" + else + BASE_DIR="/mnt" + fi + + MOUNT_POINT="$BASE_DIR/storagebox" + CACHE_DIR="$BASE_DIR/rclone_cache" - mkdir -p "$MOUNT_POINT" - echo -e "${YELLOW}Mounting to $MOUNT_POINT... (Ctrl+C to stop)${NC}" - rclone mount "${REMOTE_NAME}:" "$MOUNT_POINT" --vfs-cache-mode writes + echo -e "${BLUE}Target: $MOUNT_POINT${NC}" + echo -e "${BLUE}Cache: $CACHE_DIR${NC}" + + if [ ! -d "$MOUNT_POINT" ] || [ ! -w "$MOUNT_POINT" ]; then + echo -e "${YELLOW}Setting up permissions for $BASE_DIR... (sudo required)${NC}" + sudo mkdir -p "$MOUNT_POINT" "$CACHE_DIR" + sudo chown $(whoami):$(id -gn) "$MOUNT_POINT" "$CACHE_DIR" + fi + + echo -e "${YELLOW}Mounting... (Ctrl+C to stop)${NC}" + + rclone mount "${REMOTE_NAME}:" "$MOUNT_POINT" \ + --vfs-cache-mode full \ + --cache-dir "$CACHE_DIR" \ + --vfs-cache-max-size 10G \ + --vfs-cache-max-age 24h ;; q) exit 0