diff options
| author | NotAShelf <[email protected]> | 2022-12-15 15:39:55 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-12-15 12:39:55 +0000 |
| commit | 9702b8ce757d1ecd32d62bde1e339a74ba11dd1c (patch) | |
| tree | 05b348ada117b57df0bcee7114d13a6afb8e8cee | |
| parent | efc686423ac9764b64177db9c80e4835d57863d7 (diff) | |
| download | Hyprland-9702b8ce757d1ecd32d62bde1e339a74ba11dd1c.tar.gz Hyprland-9702b8ce757d1ecd32d62bde1e339a74ba11dd1c.zip | |
do not overwrite existing `hyprland.desktop` (#1228)
* copy desktop file only if does not exist
- Should no longer overwrite modified desktop files for pre-packaged versions of Hyprland.
* re-add cleaninstall with deprecation notice
Co-authored-by: NotAShelf <[email protected]>
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | docs/Hyprland.1 | 2 | ||||
| -rw-r--r-- | docs/hyprctl.1 | 2 |
3 files changed, 5 insertions, 20 deletions
@@ -160,10 +160,10 @@ install: cd hyprctl && make all && cd .. mkdir -p /usr/share/wayland-sessions - cp ./example/hyprland.desktop /usr/share/wayland-sessions/ mkdir -p ${PREFIX}/bin cp ./build/Hyprland ${PREFIX}/bin cp ./hyprctl/hyprctl ${PREFIX}/bin + if [ ! -f /usr/share/wayland-sessions/hyprland.desktop ]; then cp ./example/hyprland.desktop /usr/share/wayland-sessions; fi mkdir -p ${PREFIX}/share/hyprland cp ./assets/wall_2K.png ${PREFIX}/share/hyprland cp ./assets/wall_4K.png ${PREFIX}/share/hyprland @@ -172,23 +172,8 @@ install: install -Dm644 -t ${PREFIX}/share/man/man1 ./docs/*.1 cleaninstall: - make clear - make fixwlr - cd ./subprojects/wlroots && meson build/ --buildtype=release && ninja -C build/ && cp ./build/libwlroots.so.12032 /usr/lib/ && cd ../.. - make protocols - make release - cd hyprctl && make all && cd .. - - mkdir -p /usr/share/wayland-sessions - mkdir -p ${PREFIX}/bin - cp ./build/Hyprland ${PREFIX}/bin - cp ./hyprctl/hyprctl ${PREFIX}/bin - mkdir -p ${PREFIX}/share/hyprland - cp ./assets/wall_2K.png ${PREFIX}/share/hyprland - cp ./assets/wall_4K.png ${PREFIX}/share/hyprland - cp ./assets/wall_8K.png ${PREFIX}/share/hyprland - - install -Dm644 -t ${PREFIX}/share/man/man1 ./docs/*.1 + echo -en "make cleaninstall has been DEPRECATED, you should avoid using it in the future.\nRunning make install instead...\n" + make install uninstall: rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop diff --git a/docs/Hyprland.1 b/docs/Hyprland.1 index 9dfb569f..47ef3dd9 100644 --- a/docs/Hyprland.1 +++ b/docs/Hyprland.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 2.9.2.1 .\" -.TH "Hyprland" "1" "02 Dec 2022" "" "Hyprland User Manual" +.TH "Hyprland" "1" "14 Dec 2022" "" "Hyprland User Manual" .hy .SH NAME .PP diff --git a/docs/hyprctl.1 b/docs/hyprctl.1 index 82f4700b..5d9ea6a9 100644 --- a/docs/hyprctl.1 +++ b/docs/hyprctl.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 2.9.2.1 .\" -.TH "hyprctl" "1" "02 Dec 2022" "" "hyprctl User Manual" +.TH "hyprctl" "1" "14 Dec 2022" "" "hyprctl User Manual" .hy .SH NAME .PP |