hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <NotAShelf@users.noreply.github.com>
This commit is contained in:
NotAShelf 2022-12-15 15:39:55 +03:00 committed by GitHub
parent efc686423a
commit 9702b8ce75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -160,10 +160,10 @@ install:
cd hyprctl && make all && cd .. cd hyprctl && make all && cd ..
mkdir -p /usr/share/wayland-sessions mkdir -p /usr/share/wayland-sessions
cp ./example/hyprland.desktop /usr/share/wayland-sessions/
mkdir -p ${PREFIX}/bin mkdir -p ${PREFIX}/bin
cp ./build/Hyprland ${PREFIX}/bin cp ./build/Hyprland ${PREFIX}/bin
cp ./hyprctl/hyprctl ${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 mkdir -p ${PREFIX}/share/hyprland
cp ./assets/wall_2K.png ${PREFIX}/share/hyprland cp ./assets/wall_2K.png ${PREFIX}/share/hyprland
cp ./assets/wall_4K.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 install -Dm644 -t ${PREFIX}/share/man/man1 ./docs/*.1
cleaninstall: cleaninstall:
make clear echo -en "make cleaninstall has been DEPRECATED, you should avoid using it in the future.\nRunning make install instead...\n"
make fixwlr make install
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
uninstall: uninstall:
rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop

2
docs/Hyprland.1
View File

@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 2.9.2.1 .\" 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 .hy
.SH NAME .SH NAME
.PP .PP

2
docs/hyprctl.1
View File

@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 2.9.2.1 .\" 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 .hy
.SH NAME .SH NAME
.PP .PP