From 62f2d170b0a30d90ef1e77547aa90f910593702a Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Thu, 9 Nov 2023 15:39:30 +0100
Subject: [PATCH] fix: dwm script name + rootfs

---
 config                              | 4 ----
 gui/config                          | 4 ----
 gui/dwm/config                      | 4 ----
 gui/dwm/install.sh                  | 2 ++
 gui/dwm/src/{install => install.sh} | 2 --
 src/lib.sh                          | 4 ----
 6 files changed, 2 insertions(+), 18 deletions(-)
 rename gui/dwm/src/{install => install.sh} (96%)

diff --git a/config b/config
index 26ea0a9..16872fd 100644
--- a/config
+++ b/config
@@ -1,8 +1,6 @@
 # User Variables
 # Comment to disable
 
-set -a
-
 swapfile=auto # auto|MB
 
 username=ange
@@ -50,6 +48,4 @@ laptop_pkg=(
     tlp
 )
 
-set +a
-
 # vim: ft=sh
diff --git a/gui/config b/gui/config
index 5775ff6..2b9e98f 100644
--- a/gui/config
+++ b/gui/config
@@ -1,8 +1,6 @@
 # User Variables
 # Comment to disable
 
-set -a
-
 pkg=(
     alacritty
     dunst
@@ -31,6 +29,4 @@ flatpakpkg=(
     org.mozilla.firefox
 )
 
-set +a
-
 # vim: ft=sh
diff --git a/gui/dwm/config b/gui/dwm/config
index 048314b..4ed5023 100644
--- a/gui/dwm/config
+++ b/gui/dwm/config
@@ -1,8 +1,6 @@
 # User Variables
 # Comment to disable
 
-set -a
-
 pkg=(
     autorandr
     i3lock xss-lock
@@ -10,6 +8,4 @@ pkg=(
     xorg-{server,xinit,xrandr,xsetroot} xclip
 )
 
-set +a
-
 # vim: ft=sh
diff --git a/gui/dwm/install.sh b/gui/dwm/install.sh
index d4684c4..070ccf5 100755
--- a/gui/dwm/install.sh
+++ b/gui/dwm/install.sh
@@ -1,4 +1,6 @@
 #!/bin/bash -e
 cd "$(dirname "$0")"
 
+
+cp -rfT rootfs/ /mnt/
 cat config ../../src/lib.sh src/install.sh | arch-chroot /mnt/ bash -ex
diff --git a/gui/dwm/src/install b/gui/dwm/src/install.sh
similarity index 96%
rename from gui/dwm/src/install
rename to gui/dwm/src/install.sh
index ff1f8ec..24c3815 100644
--- a/gui/dwm/src/install
+++ b/gui/dwm/src/install.sh
@@ -14,8 +14,6 @@ case "$(lspci -k | grep -A3 -E '(VGA|3D)')" in
 esac
 pac "${pkg[@]}"
 
-cp -rfT rootfs /
-
 git clone https://git.maby.dev/ange/suckless.git /tmp/suckless/
 cd /tmp/suckless
 ./update.sh
diff --git a/src/lib.sh b/src/lib.sh
index b860038..ca029d2 100644
--- a/src/lib.sh
+++ b/src/lib.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -a
-
 if [ -t 1 ]; then
     NORMAL='\e[0m'
     BOLD='\e[1m'
@@ -11,5 +9,3 @@ fi
 function pac() {
     yes | pacman --needed -Syu "$@"
 }
-
-set +a