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

Fixed installation issue when target directory contains spaces #2795

Merged
merged 1 commit into from
Aug 22, 2021
Merged

Conversation

hwittenborn
Copy link
Contributor

@hwittenborn hwittenborn commented Aug 22, 2021

Previously, doing something like make install DESTDIR="${PWD}/tmp dir" would not act correctly due to tmp dir containing spaces.

The main issue comes into play when I was doing testing for some packaging. I always copy the directory before doing testing, and Nautilus (which I use as my GUI file manager) names the copied directory foldername (copy), which thus causes the issue this PR aims to solve.

If it's at all feasible, it would be nice if a new release with this fix incorporated could be made as well.

Likewise fixed the same issue when uninstalling.

The issue was rooted in the fact that "DESTDIR" and "PREFIX" weren't 
quoted, which caused the 'mkdir', 'cp' and 'rm' commands to treat any 
spaces in directory names as separate arguments.

uninstall:
-rm -rf $(foreach icon_theme,$(ICON_THEMES),$(DESTDIR)$(PREFIX)/share/icons/$(icon_theme))
- rm -rf $(foreach icon_theme,$(ICON_THEMES),"$(DESTDIR)$(PREFIX)/share/icons/$(icon_theme)")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ignore the space that was added at the beginning of this line. I think I just unintentionally added it due to it looking a bit off to me.

@SmartFinn SmartFinn merged commit e7f730b into PapirusDevelopmentTeam:master Aug 22, 2021
@SmartFinn
Copy link
Member

Thanks. I think I did it deliberately because paths to icons with spaces are not valid. Now I see that in the case of packaging, this approach is incorrect.

SmartFinn added a commit that referenced this pull request Aug 22, 2021
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.

2 participants