Author: pierre
Date: Fri Sep 28 07:35:46 2018
New Revision: 4064
Log:
Add possibility to automate bash shell startup files, vimrc, and rng.
This adds a new variable to the configuration (LANGUAGE).
Also automate the generation of various instructions
Modified:
jhalfs/trunk/BLFS/gen-special.sh
jhalfs/trunk/BLFS/gen_pkg_book.sh
jhalfs/trunk/BLFS/xsl/gen_config.xsl
jhalfs/trunk/BLFS/xsl/scripts.xsl
jhalfs/trunk/common/libs/func_install_blfs
Modified: jhalfs/trunk/BLFS/gen-special.sh
==
--- jhalfs/trunk/BLFS/gen-special.shTue Sep 4 03:06:09 2018(r4063)
+++ jhalfs/trunk/BLFS/gen-special.shFri Sep 28 07:35:46 2018(r4064)
@@ -38,8 +38,9 @@
sed 's@^[^"]*"\([^"]*\)".*@\1@')
# Non-versioned packages:
-NV_LIST="cacerts xorg-env kde-pre-install-config kf5-intro lxqt-pre-install \
-lxqt-post-install ojdk-conf tex-path"
+NV_LIST="postlfs-config-profile postlfs-config-random postlfs-config-vimrc \
+xorg-env kde-pre-install-config kf5-intro \
+lxqt-pre-install lxqt-post-install ojdk-conf tex-path"
# Set PATH to be sure to find udevadm
SAVPATH=$PATH
Modified: jhalfs/trunk/BLFS/gen_pkg_book.sh
==
--- jhalfs/trunk/BLFS/gen_pkg_book.sh Tue Sep 4 03:06:09 2018(r4063)
+++ jhalfs/trunk/BLFS/gen_pkg_book.sh Fri Sep 28 07:35:46 2018(r4064)
@@ -30,7 +30,10 @@
declare -a TARGET
declare DEP_LEVEL
declare SUDO
+declare LANGUAGE
declare WRAP_INSTALL
+declare DEL_LA_FILES
+declare STATS
#--#
parse_configuration() {#
@@ -52,6 +55,7 @@
WRAP_INSTALL=* | \
DEL_LA_FILES=* | \
STATS=* | \
+ LANGUAGE=* | \
SUDO=* ) eval ${REPLY} # Define/set a global variable..
continue ;;
esac
@@ -79,7 +83,7 @@
validate_configuration() { #
#--#
local -r dotSTR=".."
- local -r PARAM_LIST="DEP_LEVEL SUDO MAIL_SERVER WRAP_INSTALL DEL_LA_FILES
STATS"
+ local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE MAIL_SERVER WRAP_INSTALL
DEL_LA_FILES STATS"
local -r PARAM_VALS='${config_param}${dotSTR:${#config_param}}
${L_arrow}${BOLD}${!config_param}${OFF}${R_arrow}'
local config_param
local -i index
@@ -211,6 +215,7 @@
--stringparam wrap-install "$WRAP_INSTALL" \
--stringparam del-la-files "$DEL_LA_FILES" \
--stringparam list-stat "$LIST_STAT" \
+ --stringparam language "$LANGUAGE" \
-o ./scripts/ ${MakeScripts} \
${BookXml}
# Make the scripts executable.
Modified: jhalfs/trunk/BLFS/xsl/gen_config.xsl
==
--- jhalfs/trunk/BLFS/xsl/gen_config.xslTue Sep 4 03:06:09 2018
(r4063)
+++ jhalfs/trunk/BLFS/xsl/gen_config.xslFri Sep 28 07:35:46 2018
(r4064)
@@ -55,6 +55,12 @@
default 3 if DEPLVL_3
default 4 if DEPLVL_4
+config LANGUAGE
+string "LANG variable in the form ll_CC.charmap[@modifiers]"
+default "en_US.UTF-8"
+help
+Because of the book layout, the 3 fields, ll, CC and charmap are
+mandatory. The @modfier is honoured if present.
config SUDO
bool "Build as User"
Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl Tue Sep 4 03:06:09 2018(r4063)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl Fri Sep 28 07:35:46 2018(r4064)
@@ -34,6 +34,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,12 +168,12 @@
-
+
exit
-
+
@@ -153,7 +188,7 @@
-
+
@@ -208,14 +243,17 @@
-
+
sudo /sbin/
ldconfig
-
+
@@ -455,6 +493,25 @@
+
+
+
+
+
+
+
+cat > ~/.vimrc EOF
+
+
+
+EOF
+
+
+
+
+
+
+
@@ -464,6 +521,10 @@
+
+
+
+$USER
+
+
+
+imps2
+
+
+/dev/input/mice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4
+
+
+
+$USER ${USER}@mail.bogus
+
+
+
+
+
+
+
+1024
+
+
**EDITME
EDITME**
+
