gardesk/tarmac-web / a81762c

Browse files

fix install script: match release asset naming, bundle ers

Authored by espadonne
SHA
a81762c27fcb934363a47cb5d27457e43be0bcc1
Parents
bb53778
Tree
a91607e

1 changed file

StatusFile+-
M public/install.sh 8 35
public/install.shmodified
@@ -9,7 +9,6 @@
99
 set -euo pipefail
1010
1111
 REPO="gardesk/tarmac"
12
-ERS_REPO="gardesk/ers"
1312
 INSTALL_DIR="/usr/local/bin"
1413
1514
 info() { printf '\033[0;34m%s\033[0m\n' "$1"; }
@@ -25,8 +24,8 @@ if [ "$OS" != "Darwin" ]; then
2524
 fi
2625
2726
 case "$ARCH" in
28
-  arm64|aarch64) ARCH_LABEL="aarch64-apple-darwin" ;;
29
-  x86_64)        ARCH_LABEL="x86_64-apple-darwin" ;;
27
+  arm64|aarch64) ARCH_LABEL="darwin-arm64" ;;
28
+  x86_64)        ARCH_LABEL="darwin-x86_64" ;;
3029
   *) error "Unsupported architecture: $ARCH" ;;
3130
 esac
3231
@@ -66,13 +65,18 @@ if curl -fsSL "$TARBALL_URL" -o "$TMPDIR/tarmac.tar.gz"; then
6665
   if [ -w "$INSTALL_DIR" ]; then
6766
     cp "$TMPDIR/tarmac" "$INSTALL_DIR/"
6867
     cp "$TMPDIR/tarmacctl" "$INSTALL_DIR/" 2>/dev/null || true
68
+    cp "$TMPDIR/ers" "$INSTALL_DIR/" 2>/dev/null || true
6969
   else
7070
     sudo cp "$TMPDIR/tarmac" "$INSTALL_DIR/"
7171
     sudo cp "$TMPDIR/tarmacctl" "$INSTALL_DIR/" 2>/dev/null || true
72
+    sudo cp "$TMPDIR/ers" "$INSTALL_DIR/" 2>/dev/null || true
7273
   fi
73
-  sudo chmod +x "$INSTALL_DIR/tarmac" "$INSTALL_DIR/tarmacctl" 2>/dev/null || true
74
+  chmod +x "$INSTALL_DIR/tarmac" "$INSTALL_DIR/tarmacctl" "$INSTALL_DIR/ers" 2>/dev/null || \
75
+    sudo chmod +x "$INSTALL_DIR/tarmac" "$INSTALL_DIR/tarmacctl" "$INSTALL_DIR/ers" 2>/dev/null || true
7476
7577
   info "tarmac installed to $INSTALL_DIR/tarmac"
78
+  info "tarmacctl installed to $INSTALL_DIR/tarmacctl"
79
+  info "ers installed to $INSTALL_DIR/ers"
7680
 else
7781
   warn "Could not download pre-built binary."
7882
   warn "You may need to build from source:"
@@ -81,37 +85,6 @@ else
8185
   exit 1
8286
 fi
8387
84
-# Offer to install ers
85
-echo ""
86
-info "ers (window border renderer) is optional but recommended."
87
-info "Install ers? [Y/n]"
88
-read -r INSTALL_ERS </dev/tty 2>/dev/null || INSTALL_ERS="y"
89
-INSTALL_ERS=${INSTALL_ERS:-y}
90
-
91
-if [[ "$INSTALL_ERS" =~ ^[Yy] ]]; then
92
-  ERS_LATEST=$(curl -fsSL "https://api.github.com/repos/$ERS_REPO/releases/latest" 2>/dev/null | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/' || echo "")
93
-
94
-  if [ -n "$ERS_LATEST" ]; then
95
-    ERS_URL="https://github.com/$ERS_REPO/releases/download/$ERS_LATEST/ers-$ERS_LATEST-$ARCH_LABEL.tar.gz"
96
-    if curl -fsSL "$ERS_URL" -o "$TMPDIR/ers.tar.gz" 2>/dev/null; then
97
-      tar xzf "$TMPDIR/ers.tar.gz" -C "$TMPDIR"
98
-      if [ -w "$INSTALL_DIR" ]; then
99
-        cp "$TMPDIR/ers" "$INSTALL_DIR/"
100
-      else
101
-        sudo cp "$TMPDIR/ers" "$INSTALL_DIR/"
102
-      fi
103
-      sudo chmod +x "$INSTALL_DIR/ers" 2>/dev/null || true
104
-      info "ers installed to $INSTALL_DIR/ers"
105
-    else
106
-      warn "Could not download ers binary. Install manually:"
107
-      warn "  brew tap gardesk/tap && brew install ers"
108
-    fi
109
-  else
110
-    warn "Could not find ers releases. Install manually:"
111
-    warn "  brew tap gardesk/tap && brew install ers"
112
-  fi
113
-fi
114
-
11588
 echo ""
11689
 info "Installation complete."
11790
 echo ""