From b70f1bda9aeff755fcdb57a9541a92adc0289ad9 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Sat, 30 Dec 2017 12:17:30 -0700
Subject: [PATCH] Removed %INSTALL_DIR% code

* Using hardcoded 'arch' in it's place
* The initrd boot variables weren't being set properly
---
 .linux_items/include/EFI/boot/refind.conf  | 2 +-
 .linux_items/include/isolinux/isolinux.cfg | 2 +-
 Build Linux                                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf
index 87ff7daa..075f6e46 100644
--- a/.linux_items/include/EFI/boot/refind.conf
+++ b/.linux_items/include/EFI/boot/refind.conf
@@ -24,7 +24,7 @@ menuentry "Linux" {
     loader /arch/boot/x86_64/vmlinuz
     initrd  /arch/boot/intel_ucode.img
     initrd /arch/boot/x86_64/archiso.img
-    options "archisobasedir=$INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3"
+    options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3"
     submenuentry "Linux (i3)" {
         add_options "i3"
     }
diff --git a/.linux_items/include/isolinux/isolinux.cfg b/.linux_items/include/isolinux/isolinux.cfg
index 291d5610..736fecf0 100644
--- a/.linux_items/include/isolinux/isolinux.cfg
+++ b/.linux_items/include/isolinux/isolinux.cfg
@@ -2,5 +2,5 @@ PATH /%INSTALL_DIR%/boot/syslinux/
 DEFAULT loadconfig
 
 LABEL loadconfig
-  CONFIG /%INSTALL_DIR%/boot/syslinux/wklive.cfg
+  CONFIG /%INSTALL_DIR%/boot/syslinux/wk.cfg
   APPEND /%INSTALL_DIR%/
diff --git a/Build Linux b/Build Linux
index af28ee2f..a1d6a791 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -110,6 +110,7 @@ function copy_live_env() {
     rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/"
     mkdir -p "$LIVE_DIR/airootfs/usr/local/bin"
     rsync -aI "$ROOT_DIR/.bin/Scripts/" "$LIVE_DIR/airootfs/usr/local/bin/"
+    cp -a "$BUILD_DIR/main.py" "$LIVE_DIR/airootfs/usr/local/bin/"
 }
 
 function run_elevated() {
@@ -144,8 +145,7 @@ function update_live_env() {
     cp "$ROOT_DIR/Images/rEFInd.png" "$LIVE_DIR/EFI/boot/rEFInd.png"
     rsync -aI "/usr/share/refind/drivers_x64/" "$LIVE_DIR/EFI/boot/drivers_x64/"
     rsync -aI "/usr/share/refind/icons/" "$LIVE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg"
-    sed -i "s/%ARCHISO_LABEL%/${label}/;
-            s/%INSTALL_DIR%/${install_dir}/" "$LIVE_DIR/EFI/boot/refind.conf"
+    sed -i "s/%ARCHISO_LABEL%/${label}/" "$LIVE_DIR/EFI/boot/refind.conf"
 
     # Memtest86
     mkdir -p "$LIVE_DIR/EFI/memtest86/Benchmark"