Accidentally used J instead of j with tar.

This commit is contained in:
Scott Duensing 2023-05-04 20:03:51 -05:00
parent 8b860ab407
commit 139f1d8fe3

View file

@ -126,6 +126,15 @@ function doBuild() {
G_BUILD_PROJECT= G_BUILD_PROJECT=
PROJECT_TYPE= PROJECT_TYPE=
# Sample project file:
#
# application
# Warehouse
# IIgs 65816
# Linux i386 x86_64
# Windows i686 x86_64
# MacOS i386 x86_64 aarch64
# Read project information. # Read project information.
while IFS= read -r LINE; do while IFS= read -r LINE; do
# If we don't have a project type, grab it from the first line of the project file and set things up. # If we don't have a project type, grab it from the first line of the project file and set things up.
@ -203,11 +212,11 @@ function doBuild() {
fi fi
done done
done < build.start done <build.start
# Compress the results. # Compress the results.
tBoldBox tPURPLE "Packaging \"${G_BUILD_PROJECT}\"..." tBoldBox tPURPLE "Packaging \"${G_BUILD_PROJECT}\"..."
tar cJf build.temp results tar cjf build.temp results
tSudo chown ${USERNAME}:${USERNAME} build.temp tSudo chown ${USERNAME}:${USERNAME} build.temp
# Erase everything except the temp file. # Erase everything except the temp file.
@ -382,28 +391,38 @@ function startBuildServer() {
cd ${G_EHOME} cd ${G_EHOME}
# Log startup. # Log startup.
echo "$(date) - Startup ${0}" >> ${LOG} echo "$(date) - Startup ${0}" >>${LOG}
# Sample info file:
#
# 1.0
# ------------------------------------------------------------------------------
# project application "JoeyLib Application"
# target IIgs "Apple IIgs" 65816
# target Linux "Linux" i386 x86_64
# target MacOS "Modern MacOS" i386 x86_64 aarch64
# target Windows "Windows XP+" i686 x86_64
# Build supported project types and target details for JoeyDev. # Build supported project types and target details for JoeyDev.
echo "1.0" > dist/joeydev.info echo "1.0" >dist/joeydev.info
echo "------------------------------------------------------------------------------" >> dist/joeydev.info echo "------------------------------------------------------------------------------" >>dist/joeydev.info
echo "project application \"JoeyLib Application\"" >> dist/joeydev.info echo "project application \"JoeyLib Application\"" >>dist/joeydev.info
# echo "project joeylib \"JoeyLib Itself\"" >> http/joeydev.info # echo "project joeylib \"JoeyLib Itself\"" >> http/joeydev.info
for TARGET in ${G_EHOME}/targets/*.target; do for TARGET in ${G_EHOME}/targets/*.target; do
NAME=$(basename -s .target ${TARGET}) NAME=$(basename -s .target ${TARGET})
call RESULT ${NAME} enabled call RESULT ${NAME} enabled
if [[ ${RESULT} -eq 1 ]]; then if [[ ${RESULT} -eq 1 ]]; then
call ARCHS ${NAME} architectures call ARCHS ${NAME} architectures
call DESCRIPTION ${NAME} friendlyName call DESCRIPTION ${NAME} friendlyName
echo "target ${NAME} \"${DESCRIPTION}\" ${ARCHS}" >> dist/joeydev.info echo "target ${NAME} \"${DESCRIPTION}\" ${ARCHS}" >>dist/joeydev.info
fi fi
done done
# Identify ourselves. # Identify ourselves.
echo "<html><head><title>JoeyBuild Server</title></head><body>This is a <a href=\"https://joeylib.com\">JoeyLib</a> Build Server.</body></html>" > dist/index.html echo "<html><head><title>JoeyBuild Server</title></head><body>This is a <a href=\"https://joeylib.com\">JoeyLib</a> Build Server.</body></html>" >dist/index.html
# Start the PHP web server if it's not already running. # Start the PHP web server if it's not already running.
php -S 0.0.0.0:${G_HTTP_PORT} -t dist >> ${LOG} 2>&1 & php -S 0.0.0.0:${G_HTTP_PORT} -t dist >>${LOG} 2>&1 &
# Start the actual build server. # Start the actual build server.
cd /home cd /home
@ -428,7 +447,7 @@ function startBuildServer() {
doBuild ${USERNAME} doBuild ${USERNAME}
# Log it. # Log it.
echo "$(date) - Compiled ${G_BUILD_PROJECT} for ${USERNAME} on ${G_BUILD_PLATFORMS}" >> ${LOG} echo "$(date) - Compiled ${G_BUILD_PROJECT} for ${USERNAME} on ${G_BUILD_PLATFORMS}" >>${LOG}
fi fi
done done