Merge branch 'master' into chapter7

1 files changed, 20 insertions, 14 deletions

diff --git a/env.sh b/env.sh
index 273da6c..45a5ca4 100644
--- a/env.sh
+++ b/env.sh
@@ -1,32 +1,38 @@
+#!/bin/bash
+
 # Begin book environment settings
-export PS1='\u:\w\$ '
+
+PS1='\u:\w\$ '
 set +h
 umask 022
 
-export LFS=/mnt/lfs
-export LC_ALL=POSIX
-export LFS_TGT=$(uname -m)-lfs-linux-gnu
+LFS=/mnt/lfs
+LC_ALL=POSIX
+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
+PATH=${LFS}/tools/bin:${PATH}
+CONFIG_SITE=${LFS}/usr/share/config.site
 # End book environment settings
 
 # LFS Version being built
-export LFS_VER=LFS_10_1
+LFS_VER=LFS_10_1
 
 # Disk where LFS partition will exist / or exists
-export LFS_DISK=/dev/sdb
+LFS_DISK=/dev/sdb
 
 # Partition number where LFS will exist / or exists
-export LFS_PART=1
+LFS_PART=1
 
 # LFS User password (not used at this time)
-export LFS_PWD=lfs
+LFS_PWD=lfs
 
 # Get number of online processors
-export NUMPROCS=$(getconf _NPROCESSORS_ONLN)
-numjobs=$(expr ${NUMPROCS} \* 2 - 1)
-
+NUMPROCS=$(getconf _NPROCESSORS_ONLN)
+numjobs=$((NUMPROCS * 2 - 1))
+echo $numjobs
 # Make flags for multiple jobs
-export MAKEFLAGS="-j ${numjobs}"
+MAKEFLAGS="-j ${numjobs}"
+
+export PS1 LC_ALL LFS LFS_TGT PATH CONFIG_SITE
+export LFS_VER LFS_DISK LFS_PART LFS_PWD NUMPROCS MAKEFLAGS