cleaned up tarball structure and updated install script

Author: aryonoco

.github/workflows/release.yml

@@ -216,10 +216,24 @@ jobs:
           # Copy binary
           cp bin/yabb "${ARCHIVE_NAME}/"
 
-          # Copy completions
-          cp completions/yabb.bash "${ARCHIVE_NAME}/"
-          cp completions/yabb.fish "${ARCHIVE_NAME}/"
-          cp completions/yabb.zsh "${ARCHIVE_NAME}/"
+          # Create shell_completions directory and copy completions
+          mkdir -p "${ARCHIVE_NAME}/shell_completions"
+          cp completions/yabb.bash "${ARCHIVE_NAME}/shell_completions/"
+          cp completions/yabb.fish "${ARCHIVE_NAME}/shell_completions/"
+          cp completions/yabb.zsh "${ARCHIVE_NAME}/shell_completions/"
+
+          # Create scripts directory and copy scripts
+          mkdir -p "${ARCHIVE_NAME}/scripts"
+          cp scripts/install.sh "${ARCHIVE_NAME}/scripts/"
+          chmod +x "${ARCHIVE_NAME}/scripts/install.sh"
+          cp scripts/yabb-update.conf "${ARCHIVE_NAME}/scripts/"
+          cp scripts/yabb.service "${ARCHIVE_NAME}/scripts/"
+          cp scripts/yabb.timer "${ARCHIVE_NAME}/scripts/"
+          cp scripts/yabb-update.service "${ARCHIVE_NAME}/scripts/"
+          cp scripts/yabb-update.timer "${ARCHIVE_NAME}/scripts/"
+
+          # Create symlink for install.sh at root
+          ln -s scripts/install.sh "${ARCHIVE_NAME}/install.sh"
 
           # Copy and rename sample config
           cp config/yabb.toml.example "${ARCHIVE_NAME}/yabb.conf"

Install.txt

@@ -82,7 +82,7 @@ Use this if you downloaded the release tarball manually.
 
 1. Extract and install the binary:
 
-   tar xzf yabb-*.tar.gz
+   zstd -d -c yabb-*.tar.zst | tar -xf -
    mkdir -p ~/.local/bin
    cp yabb-*/yabb ~/.local/bin/
    chmod +x ~/.local/bin/yabb
@@ -126,17 +126,17 @@ SHELL COMPLETIONS (User Installation)
 -------------------------------------
 For Bash (add to ~/.bashrc):
    mkdir -p ~/.local/share/bash-completion/completions
-   cp yabb-*/yabb.bash ~/.local/share/bash-completion/completions/yabb
+   cp yabb-*/shell_completions/yabb.bash ~/.local/share/bash-completion/completions/yabb
    # Restart your shell or run: source ~/.local/share/bash-completion/completions/yabb
 
 For Zsh (add to ~/.zshrc):
    mkdir -p ~/.local/share/zsh/site-functions
-   cp yabb-*/yabb.zsh ~/.local/share/zsh/site-functions/_yabb
+   cp yabb-*/shell_completions/yabb.zsh ~/.local/share/zsh/site-functions/_yabb
    # Restart your shell or run: exec zsh
 
 For Fish:
    mkdir -p ~/.config/fish/completions
-   cp yabb-*/yabb.fish ~/.config/fish/completions/yabb.fish
+   cp yabb-*/shell_completions/yabb.fish ~/.config/fish/completions/yabb.fish
    # Restart your shell or run: exec fish
 
 
@@ -148,7 +148,7 @@ This installs yabb for all users on the system.
 
 1. Extract and install to /opt:
 
-   tar xzf yabb-*.tar.gz
+   zstd -d -c yabb-*.tar.zst | tar -xf -
    sudo mkdir -p /opt/yabb
    sudo cp yabb-*/yabb /opt/yabb/
    sudo chmod +x /opt/yabb/yabb
@@ -179,17 +179,17 @@ This installs yabb for all users on the system.
 SHELL COMPLETIONS (System-Wide)
 -------------------------------
 For Bash:
-   sudo cp yabb-*/yabb.bash /etc/bash_completion.d/yabb
+   sudo cp yabb-*/shell_completions/yabb.bash /etc/bash_completion.d/yabb
    # Restart your shell or run: source /etc/bash_completion.d/yabb
 
 For Zsh:
    sudo mkdir -p /usr/local/share/zsh/site-functions
-   sudo cp yabb-*/yabb.zsh /usr/local/share/zsh/site-functions/_yabb
+   sudo cp yabb-*/shell_completions/yabb.zsh /usr/local/share/zsh/site-functions/_yabb
    # Restart your shell or run: exec zsh
 
 For Fish:
    sudo mkdir -p /usr/share/fish/vendor_completions.d
-   sudo cp yabb-*/yabb.fish /usr/share/fish/vendor_completions.d/yabb.fish
+   sudo cp yabb-*/shell_completions/yabb.fish /usr/share/fish/vendor_completions.d/yabb.fish
    # Restart your shell or run: exec fish
 
 
@@ -262,6 +262,16 @@ in /opt/yabb/. Copy them to systemd:
    sudo mkdir -p /etc/yabb
    sudo cp /opt/yabb/yabb-update.conf /etc/yabb/update.conf
 
+If you installed from tarball (Option B/C), the service files are in the
+scripts/ directory of the extracted archive:
+
+   sudo cp yabb-*/scripts/yabb.service /etc/systemd/system/
+   sudo cp yabb-*/scripts/yabb.timer /etc/systemd/system/
+   sudo cp yabb-*/scripts/yabb-update.service /etc/systemd/system/
+   sudo cp yabb-*/scripts/yabb-update.timer /etc/systemd/system/
+   sudo mkdir -p /etc/yabb
+   sudo cp yabb-*/scripts/yabb-update.conf /etc/yabb/update.conf
+
 Reload systemd and enable the timers:
 
    sudo systemctl daemon-reload

scripts/install.sh

@@ -672,15 +672,45 @@ install_files() {
       if [[ ${DRY_RUN} == true ]]; then
         log_info "[DRY-RUN] Would install: ${INSTALL_DIR}/${comp}"
         installed+=1
-      elif [[ -f ${extract_dir}/${comp} ]]; then
-        cp "${extract_dir}/${comp}" "${INSTALL_DIR}/"
+      elif [[ -f ${extract_dir}/shell_completions/${comp} ]]; then
+        cp "${extract_dir}/shell_completions/${comp}" "${INSTALL_DIR}/"
         register_created_file "${INSTALL_DIR}/${comp}"
         installed+=1
       fi
     done
     log_success "Installed ${installed} completion file(s) to ${INSTALL_DIR}/"
   fi
 
+  # Install systemd service files
+  log_info "Installing systemd service files..."
+  local -a systemd_files=(
+    "yabb.service"
+    "yabb.timer"
+    "yabb-update.service"
+    "yabb-update.timer"
+    "yabb-update.conf"
+  )
+  local sfile
+  for sfile in "${systemd_files[@]}"; do
+    if [[ ${DRY_RUN} == true ]]; then
+      log_info "[DRY-RUN] Would install: ${INSTALL_DIR}/${sfile}"
+    elif [[ -f ${extract_dir}/scripts/${sfile} ]]; then
+      cp "${extract_dir}/scripts/${sfile}" "${INSTALL_DIR}/"
+      register_created_file "${INSTALL_DIR}/${sfile}"
+    fi
+  done
+  log_success "Installed systemd files to ${INSTALL_DIR}/"
+
+  # Install install.sh itself for future updates
+  if [[ ${DRY_RUN} == true ]]; then
+    log_info "[DRY-RUN] Would install: ${INSTALL_DIR}/install.sh"
+  elif [[ -f ${extract_dir}/scripts/install.sh ]]; then
+    cp "${extract_dir}/scripts/install.sh" "${INSTALL_DIR}/"
+    chmod +x "${INSTALL_DIR}/install.sh"
+    register_created_file "${INSTALL_DIR}/install.sh"
+    log_success "Installed: ${INSTALL_DIR}/install.sh"
+  fi
+
   # Handle configuration
   if [[ ${INSTALL_CONFIG} == true ]]; then
     # Always copy sample config to install dir as reference
@@ -783,13 +813,19 @@ remove_step_binary() {
 }
 
 remove_step_completions() {
-  log_step "2/3" "Removing shell completions and sample config"
+  log_step "2/3" "Removing shell completions, systemd files, and sample config"
 
   local -a files_to_remove=(
     "${INSTALL_DIR}/yabb.bash"
     "${INSTALL_DIR}/yabb.fish"
     "${INSTALL_DIR}/yabb.zsh"
     "${INSTALL_DIR}/yabb.conf"
+    "${INSTALL_DIR}/yabb.service"
+    "${INSTALL_DIR}/yabb.timer"
+    "${INSTALL_DIR}/yabb-update.service"
+    "${INSTALL_DIR}/yabb-update.timer"
+    "${INSTALL_DIR}/yabb-update.conf"
+    "${INSTALL_DIR}/install.sh"
   )
 
   local file

yabb.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version = "0.4.8"
+version = "0.4.9"
 author = "Aryan Ameri"
 description = "Yet Another BTRFS Backup"
 license = "MPL 2.0"
@@ -143,9 +143,9 @@ task releasePpc64le, "Build static binary for PowerPC 64-bit LE Linux":
 
 task releaseLoong64, "Build static binary for LoongArch64 Linux":
   exec "nim c " & releaseFlags & " " & zigccFlags & " " & "--cpu:loongarch64 " &
-    "--passC:'-target loongarch64-linux-musl' " & "--passL:'-target loongarch64-linux-musl' " &
-    "--passC:-march=loongarch64 " & ltoFlags &
-    " -o:bin/yabb-linux-loong64 src/yabb.nim"
+    "--passC:'-target loongarch64-linux-musl' " &
+    "--passL:'-target loongarch64-linux-musl' " & "--passC:-march=loongarch64 " &
+    ltoFlags & " -o:bin/yabb-linux-loong64 src/yabb.nim"
   exec "llvm-strip -s bin/yabb-linux-loong64"
   echo "Built: bin/yabb-linux-loong64"