Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use mktemp when creating temporary files. #6471

Closed
wants to merge 1 commit into from
Closed

Use mktemp when creating temporary files. #6471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,8 @@ function create_and_run_classpath_jar() {
done
unset IFS

RAND_ID=$(cat /dev/urandom | head -c 128 | md5func)
# Create manifest file
MANIFEST_FILE="${self}-${RAND_ID}.jar_manifest"
MANIFEST_FILE=$(mktemp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
MANIFEST_FILE=$(mktemp)
MANIFEST_FILE="$(mktemp -d XXXXXXXX.jar_manifest)"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit more tolerant to weird $TMPDIRs and the resulting temporary file is better named.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@meteorcloudy , do you know why this wasn't using mktemp in the first place?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no specific reason to not use mktemp. I'm fine with this change.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the template you probably wanted something like /tmp/XXXXXXXX.jar_manifest instead of XXXXXXXX.jar_manifest; see @brown's comment below.


(
echo "Manifest-Version: 1.0"
Expand All @@ -325,7 +324,7 @@ function create_and_run_classpath_jar() {
) >$MANIFEST_FILE

# Create classpath JAR file
MANIFEST_JAR_FILE="${self}-${RAND_ID}-classpath.jar"
MANIFEST_JAR_FILE=$(mktemp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
MANIFEST_JAR_FILE=$(mktemp)
MANIFEST_JAR_FILE="$(mktemp).jar"

if is_windows; then
MANIFEST_JAR_FILE="$(cygpath --windows "$MANIFEST_JAR_FILE")"
MANIFEST_FILE="$(cygpath --windows "$MANIFEST_FILE")"
Expand Down