fix oops
This commit is contained in:
parent
ee92ac8f50
commit
709870a6bb
1 changed files with 11 additions and 11 deletions
22
buildtool.sh
22
buildtool.sh
|
@ -74,8 +74,8 @@ special "|__/ |_|"
|
|||
empty
|
||||
|
||||
# Print environment configuration
|
||||
debugh "\$BUILDTOOL_DEBUG is set, debug mode is enabled"
|
||||
debugh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory"
|
||||
diagh "\$BUILDTOOL_DEBUG is set, debug mode is enabled"
|
||||
diagh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory"
|
||||
|
||||
# Checks
|
||||
## Check for Arch Linux
|
||||
|
@ -314,10 +314,10 @@ function ask_clonedir_conflictresolution() {
|
|||
warnh "Skipped conflict resolution (\$BUILDTOOL_LOCALDIR is set)"
|
||||
export "BUILDTOOL_CLONEDIR_CONFLICT=r"
|
||||
if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
|
||||
debugh "src/ directory present, appending \"--noextract\""
|
||||
diagh "src/ directory present, appending \"--noextract\""
|
||||
export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
|
||||
elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
|
||||
debugh "pkg/ directory present, appending \"--force\""
|
||||
diagh "pkg/ directory present, appending \"--force\""
|
||||
export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
|
||||
fi
|
||||
return
|
||||
|
@ -335,10 +335,10 @@ function ask_clonedir_conflictresolution() {
|
|||
;;
|
||||
"r"|"R")
|
||||
if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
|
||||
debugh "src/ directory present, appending \"--noextract\""
|
||||
diagh "src/ directory present, appending \"--noextract\""
|
||||
export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
|
||||
elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
|
||||
debugh "pkg/ directory present, appending \"--force\""
|
||||
diagh "pkg/ directory present, appending \"--force\""
|
||||
export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
|
||||
fi
|
||||
;;
|
||||
|
@ -401,12 +401,12 @@ cd "${BUILDTOOL_CLONEDIR}"
|
|||
|
||||
# Print debug information
|
||||
if [ -n "${BUILDTOOL_DEBUG}" ]; then
|
||||
debugh "Printing debug information"
|
||||
debuge "Environment variables:"
|
||||
diagh "Printing debug information"
|
||||
diage "Environment variables:"
|
||||
env|grep "BUILDTOOL_"|sort
|
||||
debugh "More debug information:"
|
||||
debuge "Build cmdline=${BUILDTOOL_BUILDCMDLINE} ${BUILDTOOL_PKGBUILD_XCONFIG} ${BUILDTOOL_PKGBUILD_NCONFIG} ${BUILDTOOL_PKGBUILD_CPFINALCONFIG} ${BUILDTOOL_PKGBUILD_MODPROBEDDB} ${BUILDTOOL_PKGBUILD_SUBARCHITECTURE} ${BUILDTOOL_PKGBUILD_DEBUG} makepkg --syncdeps -p PKGBUILD.buildtool"
|
||||
debuge "Cwd=$(pwd)"
|
||||
diagh "More debug information:"
|
||||
diage "Build cmdline=${BUILDTOOL_BUILDCMDLINE} ${BUILDTOOL_PKGBUILD_XCONFIG} ${BUILDTOOL_PKGBUILD_NCONFIG} ${BUILDTOOL_PKGBUILD_CPFINALCONFIG} ${BUILDTOOL_PKGBUILD_MODPROBEDDB} ${BUILDTOOL_PKGBUILD_SUBARCHITECTURE} ${BUILDTOOL_PKGBUILD_DEBUG} makepkg --syncdeps -p PKGBUILD.buildtool"
|
||||
diage "Cwd=$(pwd)"
|
||||
fi
|
||||
|
||||
# Build package
|
||||
|
|
Reference in a new issue