diff --git a/install.sh b/install.sh index 2caa34f..10876d9 100644 --- a/install.sh +++ b/install.sh @@ -4,33 +4,51 @@ set -e echo "🚀 Starte Bootstrap Installation..." -# 🧠 Konfiguration GIT_REPO_SSH="ssh://git@192.168.178.5:2222/kai/workstation-config.git" GIT_REPO_HTTP="http://192.168.178.5:3000/kai/workstation-config.git" TARGET_DIR="$HOME/workstation-config" -# 🔍 Prüfen ob gültiges Repo -if git -C "$TARGET_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then - echo "🔄 Gültiges Repo gefunden – update..." - git -C "$TARGET_DIR" pull -else - echo "⚠️ Kein gültiges Repo gefunden" +# 📥 Repo sicherstellen +if ! git -C "$TARGET_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then - if [ -d "$TARGET_DIR" ]; then - echo "🧹 Entferne alten Ordner..." - rm -rf "$TARGET_DIR" - fi + echo "📥 Klone Repo..." - echo "📥 Versuche SSH Clone..." - - if git clone "$GIT_REPO_SSH" "$TARGET_DIR"; then - echo "✅ SSH Clone erfolgreich" - else - echo "⚠️ SSH fehlgeschlagen – fallback auf HTTP" + if ! git clone "$GIT_REPO_SSH" "$TARGET_DIR"; then + echo "⚠️ SSH failed → HTTP fallback" git clone "$GIT_REPO_HTTP" "$TARGET_DIR" fi +else + echo "🔄 Repo vorhanden → update" + git -C "$TARGET_DIR" pull fi -echo "⚙️ Starte Installation..." -bash "$TARGET_DIR/temp-cleanup/install.sh" \ No newline at end of file +cd "$TARGET_DIR/temp-cleanup" + +echo "📦 Installiere Temp Cleanup System..." + +SYSTEMD_USER_DIR="$HOME/.config/systemd/user" +mkdir -p "$SYSTEMD_USER_DIR" + +SERVICE_FILE="systemd/cleanup-temp.service" +TIMER_FILE="systemd/cleanup-temp.timer" +SCRIPT_FILE="cleanup_temp.sh" + +# 🔐 immer kopieren (kein Skip mehr!) +cp "$TARGET_DIR/temp-cleanup/$SCRIPT_FILE" "$TARGET_DIR/temp-cleanup/" +cp "$TARGET_DIR/temp-cleanup/$SERVICE_FILE" "$TARGET_DIR/temp-cleanup/" +cp "$TARGET_DIR/temp-cleanup/$TIMER_FILE" "$TARGET_DIR/temp-cleanup/" 2>/dev/null || true + +chmod +x "$TARGET_DIR/temp-cleanup/$SCRIPT_FILE" + +# 🔧 Service fixen +sed "s|ExecStart=.*|ExecStart=$TARGET_DIR/temp-cleanup/$SCRIPT_FILE|" \ + "$TARGET_DIR/temp-cleanup/$SERVICE_FILE" > "$SYSTEMD_USER_DIR/cleanup-temp.service" + +cp "$TARGET_DIR/temp-cleanup/$TIMER_FILE" "$SYSTEMD_USER_DIR/" 2>/dev/null || true + +systemctl --user daemon-reload +systemctl --user enable cleanup-temp.timer 2>/dev/null || true +systemctl --user restart cleanup-temp.timer 2>/dev/null || true + +echo "✅ Installation abgeschlossen!" \ No newline at end of file