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.

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

Remove $FreeBSD$: one line sh-pattern #870

Closed
wants to merge 1 commit into from

Conversation

jlduran
Copy link
Contributor

@jlduran jlduran commented Oct 17, 2023

Remove /^\s*#[#!]?\s*$FreeBSD$.*$\n/

cc/ @bsdimp

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
@bsdimp bsdimp self-requested a review October 17, 2023 23:52
Copy link
Member

@bsdimp bsdimp left a comment

Choose a reason for hiding this comment

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

This is good

@@ -86,9 +86,7 @@ mkimg_rebase()
fi

if test $update = yes; then
# Prevent keyword expansion when writing the keyword.
(echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline
Copy link
Member

Choose a reason for hiding this comment

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

I deleted this three times today....

@bsdimp
Copy link
Member

bsdimp commented Oct 18, 2023

Pushed as 3b5c984 with a re-worded commit message.
Thanks for saving me the trouble of doing this... In testing I removed the pattern from the shell script one time too few :(.

@bsdimp bsdimp closed this Oct 18, 2023
@bsdimp bsdimp added the merged label Oct 18, 2023
freebsd-git pushed a commit that referenced this pull request Oct 18, 2023
Remove the $FreeBSD$ pattern added to the tests, as well as fixing the
mkimg_test.sh script to stop adding it when we rebase the tests.

Reviewed by: imp, emaste
Pull Request: #870
freebsd-git pushed a commit that referenced this pull request Oct 18, 2023
Remove the $FreeBSD$ pattern added to the tests, as well as fixing the
mkimg_test.sh script to stop adding it when we rebase the tests.

Reviewed by: imp, emaste
Pull Request: #870

(cherry picked from commit 3b5c984)
freebsd-git pushed a commit that referenced this pull request Oct 19, 2023
Remove the $FreeBSD$ pattern added to the tests, as well as fixing the
mkimg_test.sh script to stop adding it when we rebase the tests.

Reviewed by: imp, emaste
Pull Request: #870

(cherry picked from commit 3b5c984)
(cherry picked from commit 9ed4f43)
Approved-by: re (cperciva)
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Feb 24, 2024
Remove the $FreeBSD$ pattern added to the tests, as well as fixing the
mkimg_test.sh script to stop adding it when we rebase the tests.

Reviewed by: imp, emaste
Pull Request: freebsd/freebsd-src#870
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants