ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 21:07:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #87 from bhundven/fix_command_exec

Browse Source 
scripts: If paths.sh is included, use the variables
This commit is contained in:
Bryan Hundven 2015-05-09 20:11:32 -07:00
commit 13bb007cb7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/addToolVersion.sh
View File

@ -80,9 +80,9 @@ addToolVersion() {
# to try adding a new version if the one he/she wants is not listed.
# But it can be the case where the version is hidden behind either one
# of EXPERIMENTAL or OBSOLETE, so warn if the version is already listed.
if grep -E "^config ${config_ver_option}$" "${file}" >/dev/null 2>&1; then
if ${grep} -E "^config ${config_ver_option}$" "${file}" >/dev/null 2>&1; then
echo "'${tool}': version '${version}' already present:"
grep -A1 -B0 -n \
${grep} -A1 -B0 -n \
-E "^(config ${config_ver_option}| {4}prompt \"${version}\")$" \
"${file}" /dev/null
return 0

2
scripts/crosstool-NG.sh.in
View File

@ -562,7 +562,7 @@ if [ -z "${CT_RESTART}" ]; then
CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
CT_DoExecLog DEBUG install -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
CT_DoExecLog DEBUG sed -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"

6
scripts/saveSample.sh.in
View File

@ -89,8 +89,8 @@ cp .config .defconfig
CT_DoAddFileToSample() {
source="$1"
dest="$2"
inode_s=$(ls -i "${source}" |awk '{ print $1; }')
inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true)
inode_s=$(ls -i "${source}" | ${awk} '{ print $1; }')
inode_d=$(ls -i "${dest}" 2>/dev/null | ${awk} '{ print $1; }' || true)
if [ "${inode_s}" != "${inode_d}" ]; then
cp "${source}" "${dest}"
fi
@ -132,7 +132,7 @@ read -p "Reporter name [${reporter_name}]: " reporter_name
read -p "Reporter URL [${reporter_url}]: " reporter_url
if [ -n "${reporter_comment}" ]; then
echo "Old comment:"
printf "${reporter_comment}\n" |sed -r -e 's/^/ > /;'
printf "${reporter_comment}\n" | ${sed} -r -e 's/^/ > /;'
fi
echo "Reporter comment (Ctrl-D to finish, '.' to use previous):"
reporter_comment=$(cat)