diff --git a/install.conf b/install.conf index 540ec78..e07faad 100644 --- a/install.conf +++ b/install.conf @@ -5,7 +5,7 @@ BOOTLOADER grub SWRAID 1 SWRAIDLEVEL 1 FILESYSTEM xfs -IMAGE almalinux-9 +IMAGE Alma-9-latest-amd64-base.tar.gz CRYPTPASSWORD changeme PART /boot/efi vfat 512M diff --git a/install.sh b/install.sh index 6fe0b3c..c5cae9b 100644 --- a/install.sh +++ b/install.sh @@ -4,12 +4,12 @@ set -euo pipefail -# If we're being piped, save to a temp file and re-execute +# If we're being piped, download the full repo and run from there if [ ! -t 0 ]; then - TEMP_SCRIPT=$(mktemp) - cat > "$TEMP_SCRIPT" - chmod +x "$TEMP_SCRIPT" - exec bash "$TEMP_SCRIPT" + echo "[+] Downloading nullpoint installer..." + git clone https://git.dominik-roth.eu/dodox/nullpoint.git /tmp/nullpoint_installer + cd /tmp/nullpoint_installer + exec bash install.sh fi BANNER=$(cat << "EOF" @@ -82,19 +82,20 @@ echo "================================================" echo -e "\nPress Enter when you've saved the passphrase..." read -r < /dev/tty -# Clone or download the nullpoint repo -echo "[+] Downloading nullpoint configuration..." -if command -v git &> /dev/null; then - git clone https://git.dominik-roth.eu/dodox/nullpoint.git /tmp/nullpoint +# Check if we're already in the nullpoint directory or need to use it +if [ -f "install.conf" ] && [ -f "post-install.sh" ]; then + echo "[+] Using local nullpoint files..." else - echo "ERROR: git not available and wget fallback insufficient for dotfiles" - echo "Please install git or use manual installation method" - exit 1 + # Clean up any existing directory + if [ -d "/tmp/nullpoint" ]; then + rm -rf /tmp/nullpoint + fi + echo "[+] Downloading nullpoint configuration..." + git clone https://git.dominik-roth.eu/dodox/nullpoint.git /tmp/nullpoint + cd /tmp/nullpoint fi -# Update install.conf echo "[+] Configuring installation..." -cd /tmp/nullpoint # Auto-detect drives echo "[+] Detecting drives..."