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

Added PATH variable to generated Makefile. /usr/sbin may not be in builders PATH

Browse source
This commit is contained in:
George Boudreau 2006-09-15 21:19:27 +00:00
parent 0167dd8b64
commit 80f0ea1a8e
6 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CLFS/master.sh
View file

@ -1152,6 +1152,8 @@ LUSER_HOME = /home/\$(LUSER)
PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n" PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
export PATH := \${PATH}:/usr/sbin
include makefile-functions include makefile-functions
EOF EOF

2
CLFS2/master.sh
View file

@ -456,6 +456,8 @@ SU_LUSER = su - \$(LUSER) -c
PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
LUSER_HOME = /home/\$(LUSER) LUSER_HOME = /home/\$(LUSER)
export PATH := \${PATH}:/usr/sbin
include makefile-functions include makefile-functions
EOF EOF

2
HLFS/master.sh
View file

@ -524,6 +524,8 @@ LUSER_HOME = /home/\$(LUSER)
PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n" PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
export PATH := \${PATH}:/usr/sbin
include makefile-functions include makefile-functions
EOF EOF

1
LFS/master.sh
View file

@ -405,6 +405,7 @@ LUSER_HOME = /home/\$(LUSER)
PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT) \`\n" PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT) \`\n"
PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n" PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
export PATH := \${PATH}:/usr/sbin
include makefile-functions include makefile-functions

10
common/func_check_version.sh
View file

@ -36,7 +36,9 @@ inline_doc
exit 1 exit 1
} }
echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}" echo -ne "${TXT}${dotSTR:${#TXT}}${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
# echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
IFS=".-(p" # Split up w.x.y.z as well as w.x.y-rc (catch release candidates) IFS=".-(p" # Split up w.x.y.z as well as w.x.y-rc (catch release candidates)
set -- $ref_version # set postional parameters to minimum ver values set -- $ref_version # set postional parameters to minimum ver values
ref_major=$1; ref_minor=$2; ref_revision=$3 ref_major=$1; ref_minor=$2; ref_revision=$3
@ -45,13 +47,13 @@ inline_doc
major=$1; minor=$2; revision=$3 major=$1; minor=$2; revision=$3
# #
# Compare against minimum acceptable version.. # Compare against minimum acceptable version..
(( major > ref_major )) && echo " ..OK" && return (( major > ref_major )) && echo " ..${GREEN}OK${OFF}" && return
(( major < ref_major )) && write_error_and_die (( major < ref_major )) && write_error_and_die
# major=ref_major # major=ref_major
(( minor < ref_minor )) && write_error_and_die (( minor < ref_minor )) && write_error_and_die
(( minor > ref_minor )) && echo " ..OK" && return (( minor > ref_minor )) && echo " ..${GREEN}OK${OFF}" && return
# minor=ref_minor # minor=ref_minor
(( revision >= ref_revision )) && echo " ..OK" && return (( revision >= ref_revision )) && echo " ..${GREEN}OK${OFF}" && return
# oops.. write error msg and die # oops.. write error msg and die
write_error_and_die write_error_and_die

11
jhalfs
View file

@ -257,6 +257,17 @@ else
echo "${nl_}\"${RED}sudo${OFF}\" ${BOLD}must be installed on your system for jhalfs to run" echo "${nl_}\"${RED}sudo${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
exit 1 exit 1
fi fi
xsltprocVer=`xsltproc -V | head -n1 `
libxmlVer=$(echo $xsltprocVer | cut -d " " -f3)
libxsltVer=$(echo $xsltprocVer | cut -d " " -f5)
tidyVer=`tidy -V | cut -d " " -f9`
# Version numbers are packed strings not xx.yy.zz format.
check_version "2.06.20" "${libxmlVer:0:1}.${libxmlVer:1:2}.${libxmlVer:3:2}" "LIBXML2"
check_version "1.01.14" "${libxsltVer:0:1}.${libxsltVer:1:2}.${libxsltVer:3:2}" "LIBXSLT"
check_version "2004" "${tidyVer}" "TIDY"
echo "${SD_BORDER}${nl_}" echo "${SD_BORDER}${nl_}"
validate_config validate_config