JeremyStarTM/jstm-optimized
JeremyStarTM/jstm-optimized
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

fix oops

Browse source
This commit is contained in:
JeremyStar™ 2024-03-11 01:52:17 +01:00
parent ee92ac8f50
commit 709870a6bb
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
buildtool.sh
View file

@ -74,8 +74,8 @@ special "|__/ |_|"
empty empty
# Print environment configuration # Print environment configuration
debugh "\$BUILDTOOL_DEBUG is set, debug mode is enabled" diagh "\$BUILDTOOL_DEBUG is set, debug mode is enabled"
debugh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory" diagh "\$BUILDTOOL_LOCALDIR is set, will build kernel package from current working directory"
# Checks # Checks
## Check for Arch Linux ## Check for Arch Linux
@ -314,10 +314,10 @@ function ask_clonedir_conflictresolution() {
warnh "Skipped conflict resolution (\$BUILDTOOL_LOCALDIR is set)" warnh "Skipped conflict resolution (\$BUILDTOOL_LOCALDIR is set)"
export "BUILDTOOL_CLONEDIR_CONFLICT=r" export "BUILDTOOL_CLONEDIR_CONFLICT=r"
if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
debugh "src/ directory present, appending \"--noextract\"" diagh "src/ directory present, appending \"--noextract\""
export "BUILDTOOL_MAKEPKG_REUSE= --noextract" export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then 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" export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
fi fi
return return
@ -335,10 +335,10 @@ function ask_clonedir_conflictresolution() {
;; ;;
"r"|"R") "r"|"R")
if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
debugh "src/ directory present, appending \"--noextract\"" diagh "src/ directory present, appending \"--noextract\""
export "BUILDTOOL_MAKEPKG_REUSE= --noextract" export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then 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" export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
fi fi
;; ;;
@ -401,12 +401,12 @@ cd "${BUILDTOOL_CLONEDIR}"
# Print debug information # Print debug information
if [ -n "${BUILDTOOL_DEBUG}" ]; then if [ -n "${BUILDTOOL_DEBUG}" ]; then
debugh "Printing debug information" diagh "Printing debug information"
debuge "Environment variables:" diage "Environment variables:"
env|grep "BUILDTOOL_"|sort env|grep "BUILDTOOL_"|sort
debugh "More debug information:" diagh "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" 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"
debuge "Cwd=$(pwd)" diage "Cwd=$(pwd)"
fi fi
# Build package # Build package