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

Drop unneeded escaping of - (fixes #3379) #3397

Merged
merged 1 commit into from
Sep 13, 2022

Conversation

dimkr
Copy link
Contributor

@dimkr dimkr commented Sep 12, 2022

Alternative to #3395 that should work.

@@ -66,14 +66,14 @@ DB_OTHERS="`ls -1 ${PREPATH}Packages-* | grep -v "$DB_MAIN"`"
#120903 improve pkg db selection...
case $DB_MAIN in
*"-puppy-2-"*|*"-puppy-3-"*|*"-puppy-4-"*|*"-puppy-5-"*) DB_OTHERS="" ;;
*) DB_OTHERS="`echo "$DB_OTHERS" | grep -v '\\-puppy\\-[2345]\\-'`" ;; #do not look in puppy-2, puppy-3, puppy-4 or puppy-5.
*) DB_OTHERS="`echo "$DB_OTHERS" | grep -v '\-puppy-[2345]-'`" ;; #do not look in puppy-2, puppy-3, puppy-4 or puppy-5.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ha, this one never worked in first place!

~$ (echo abcd; echo a-puppy-4-) | grep -v '\\-puppy\\-[2345]\\-'
abcd
a-puppy-4-
~$ (echo abcd; echo a-puppy-4-) | grep -v '\-puppy-[2345]-'
abcd

@dimkr dimkr mentioned this pull request Sep 12, 2022
Copy link
Contributor

@01micko 01micko left a comment

Choose a reason for hiding this comment

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

SO, by the rationale in these changes, only a leading - needs escaping in a grep call.. yes?

@dimkr
Copy link
Contributor Author

dimkr commented Sep 12, 2022

SO, by the rationale in these changes, only a leading - needs escaping in a grep call.. yes?

Yes - either escape the first - (i.e. grep '\--show-progress'), or put -- before the pattern (i.e. grep -- '--show-progress').

Copy link
Contributor

@peabee peabee left a comment

Choose a reason for hiding this comment

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

OK - will withdraw #3395 and close #3379

@dimkr
Copy link
Contributor Author

dimkr commented Sep 12, 2022

OK - will withdraw #3395 and close #3379

Let's wait with closing #3379 - first of all, see if this PR works for you at all. Once it's merged, the issue can be closed.

@dimkr
Copy link
Contributor Author

dimkr commented Sep 13, 2022

@peabee I'm waiting for you to confirm that this solves your problem. You're probably the only one running woof-CE on Slackware current.

@peabee
Copy link
Contributor

peabee commented Sep 13, 2022

Its not easy to test until it has been merged into testing branch............??

I guess I have to download Woof-CE from https://github.com/dimkr/woof-CE/tree/bugfix/more-grep-warnings

@peabee
Copy link
Contributor

peabee commented Sep 13, 2022

Just done manual edits of 0setup and 1download and they seemed OK - no grep warnings.

@dimkr
Copy link
Contributor Author

dimkr commented Sep 13, 2022

Its not easy to test until it has been merged into testing branch............??

It wasn't easy to fix either 😠

@01micko
Copy link
Contributor

01micko commented Sep 13, 2022

I'll be building on -current soon enough too. My wayland -current install even prints! 😲

I reckon merge this. In fact Ill do it now, deal with consequences, if any, later.

@01micko 01micko merged commit e75c078 into puppylinux-woof-CE:testing Sep 13, 2022
@dimkr dimkr deleted the bugfix/more-grep-warnings branch September 13, 2022 09:25
@peabee
Copy link
Contributor

peabee commented Sep 13, 2022

Test build:
BUILD_FROM_WOOF='testing;e75c078e3;2022-09-13 19:20:00 +1000'

Still get a warning during 3builddistro:

Updating system config..
gtk-update-icon-cache: Cache file created successfully.
gtk-update-icon-cache: Cache file created successfully.
gtk-update-icon-cache: Cache file created successfully.
gtk-update-icon-cache: The generated cache was invalid.
gtk-update-icon-cache: Cache file created successfully.
gtk-update-icon-cache: Cache file created successfully.
Generating /root/.jwmrc...
Executing depmod, to update module files...
grep: warning: stray \ before -

Setting Desktop Icon Theme...

@peabee
Copy link
Contributor

peabee commented Sep 13, 2022

OK after a lot of digging looks like its:
/woof-code/rootfs-skeleton/usr/sbin/quicksetup
line 458:
[ "echo -n "$CURRLANG" | grep 'UTF\-8'" != "" ] && UTF8='.UTF-8'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants