zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more changes made to accomodate bash-3.2

Browse source
This commit is contained in:
George Boudreau 2006-10-24 02:49:37 +00:00
parent a16f769dcf
commit a96109a275
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BLFS/gen_pkg_book.sh
View file

@ -56,7 +56,7 @@ parse_configuration() { #
continue ;; continue ;;
esac esac
if [[ "${REPLY}" =~ "^CONFIG_" ]]; then if [[ "${REPLY}" =~ ^CONFIG_ ]]; then
echo -n "$REPLY" echo -n "$REPLY"
if [[ $((++cntr)) > 1 ]]; then if [[ $((++cntr)) > 1 ]]; then
echo " <<-- ERROR SELECT ONLY 1 PACKAGE AT A TIME, WILL NOT BUILD" echo " <<-- ERROR SELECT ONLY 1 PACKAGE AT A TIME, WILL NOT BUILD"
@ -107,7 +107,7 @@ regenerate_deps() { #
# Drop the "=y" # Drop the "=y"
REPLY=${REPLY%=*} REPLY=${REPLY%=*}
if [[ "${REPLY}" =~ "^DEP_" ]]; then if [[ "${REPLY}" =~ ^DEP_ ]]; then
META_PACKAGE=$(echo $REPLY | cut -d "_" -f2 | tr [A-Z] [a-z]) META_PACKAGE=$(echo $REPLY | cut -d "_" -f2 | tr [A-Z] [a-z])
DEP_FNAME=$(echo $REPLY | cut -d "_" -f3) DEP_FNAME=$(echo $REPLY | cut -d "_" -f3)
echo "${DEP_FNAME}" >>libs/${META_PACKAGE}.dep-MOD echo "${DEP_FNAME}" >>libs/${META_PACKAGE}.dep-MOD

2
blfs-tool
View file

@ -38,7 +38,7 @@ declare -r L_arrow=$'\e[1;33m<\e[0m'
simple_error() { # Basic error trap.... JUST DIE simple_error() { # Basic error trap.... JUST DIE
#-----------------------# #-----------------------#
# If +e then disable text output # If +e then disable text output
if [[ "$-" =~ "e" ]]; then if [[ "$-" =~ e ]]; then
echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2 echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2
fi fi
} }

2
common/func_validate_configs.sh
View file

@ -159,7 +159,7 @@ inline_doc
SRC_ARCHIVE) [[ "$GETPKG" = "y" ]] && validate_dir -z+ -d -w+ ;; SRC_ARCHIVE) [[ "$GETPKG" = "y" ]] && validate_dir -z+ -d -w+ ;;
# The build directory/partition MUST exist and be writable by the user # The build directory/partition MUST exist and be writable by the user
BUILDDIR) validate_dir -z -d -w BUILDDIR) validate_dir -z -d -w
[[ "xx x/x" =~ "x${!config_param}x" ]] && write_error_and_die ;; [[ "xx x/x" =~ x${!config_param}x ]] && write_error_and_die ;;
# Validate files, testable states: # Validate files, testable states:
# fatal -z -e -s -w -x -r, # fatal -z -e -s -w -x -r,

2
jhalfs
View file

@ -36,7 +36,7 @@ declare -r L_arrow=$'\e[1;33m<\e[0m'
simple_error() { # Basic error trap.... JUST DIE simple_error() { # Basic error trap.... JUST DIE
#-----------------------# #-----------------------#
# If +e then disable text output # If +e then disable text output
if [[ "$-" =~ "e" ]]; then if [[ "$-" =~ e ]]; then
echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2 echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2
fi fi
} }

2
optimize/optimize_functions
View file

@ -75,7 +75,7 @@ wrt_makeflags() { # Apply MAKEFLAGS to build
local pkg=$1 local pkg=$1
local MKF local MKF
if [[ "$BLACK_LIST" =~ "$pkg" ]]; then if [[ "$BLACK_LIST" =~ ${pkg} ]]; then
MKF=unset MKF=unset
else else
MKF=$MAKEFLAGS MKF=$MAKEFLAGS