Add patches.csv to be copied and processed in download.

2 files changed, 7 insertions, 20 deletions

diff --git a/download.sh b/download.sh
index 99b0f7d..0a4fd9f 100755
--- a/download.sh
+++ b/download.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-cat packages.csv | while read line; do
+# Packages
+cat packages.csv patches.csv | while read line; do
     NAME="$(echo $line | cut -d\, -f1)"
     VERSION="$(echo $line | cut -d\, -f2)"
     URL="$(echo $line | cut -d\, -f3 | sed "s/@/${VERSION}/g")"
@@ -21,4 +22,6 @@ cat packages.csv | while read line; do
 
         echo -e "${GRN}OK${RST}"
     fi
-done
\ No newline at end of file
+done
+
+# Patches
diff --git a/lfs.sh b/lfs.sh
index 57665e2..e0ff904 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -1,26 +1,10 @@
 #!/bin/bash
 
+source env.sh
 source spinner.sh
 source colors.sh
 #source versioncheck.sh
 
-set +h
-umask 022
-export LFS=/mnt/lfs
-export LC_ALL=POSIX
-export LFS_TGT=$(uname -m)-lfs-linux-gnu
-PATH=/usr/bin
-if [ ! -L /bin ]; then PATH=/bin:${PATH}; fi
-export PATH=${LFS}/tools/bin:${PATH}
-export CONFIG_SITE=${LFS}/usr/share/config.site
-
-export LFS_VER=LFS10_1
-export LFS_DISK=/dev/sdb
-export LFS_ROOT=1
-export LFS_PWD=lfs
-export LFS_SRC=${LFS}/sources
-export MAKEFLAGS="-j 3"
-
 [[ -d /mnt/lfs ]] || sudo mkdir ${LFS}
 
 if ! grep -q "${LFS}" /proc/mounts; then
@@ -47,7 +31,7 @@ esac
 
 #echo -e "${LFS_PWD}\n${LFS_PWD}\n" | sudo passwd lfs
 
-cp -rf *.sh chapter* packages.csv "${LFS}/sources"
+cp -rf *.sh chapter* *.csv "${LFS}/sources"
 cd "${LFS}/sources"
 
 source download.sh