diff --git a/chatterino.pro b/chatterino.pro index 2cb069551..42df60d06 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -409,11 +409,13 @@ linux { desktop.files = resources/chatterino.desktop desktop.path = $$PREFIX/share/applications - # TODO: fix icon - # icon.files = resources/icon.png - # icon.path = $$PREFIX/share/icons/hicolor/256x256/chatterino.png + build_icons.path = . + build_icons.commands = @echo $$PWD && mkdir -p $$PWD/resources/linuxinstall/icons/hicolor/256x256 && cp $$PWD/resources/icon.png $$PWD/resources/linuxinstall/icons/hicolor/256x256/chatterino.png + + icon.files = $$PWD/resources/linuxinstall/icons/hicolor/256x256/chatterino.png + icon.path = $$PREFIX/share/icons/hicolor/256x256/apps target.path = $$PREFIX/bin - INSTALLS += desktop target + INSTALLS += desktop build_icons icon target } diff --git a/resources/.gitignore b/resources/.gitignore new file mode 100644 index 000000000..1d38bf357 --- /dev/null +++ b/resources/.gitignore @@ -0,0 +1 @@ +linuxinstall diff --git a/resources/generate_resources.py b/resources/generate_resources.py index 5239e64e8..e48795f72 100755 --- a/resources/generate_resources.py +++ b/resources/generate_resources.py @@ -8,7 +8,7 @@ ignored_files = ['qt.conf', 'resources.qrc', 'resources_autogenerated.qrc', 'win # to ignore all files in a/b, add a/b to ignored_directories. # this will ignore a/b/c/d.txt and a/b/xd.txt -ignored_directories = ['__pycache__'] +ignored_directories = ['__pycache__', 'linuxinstall'] def isNotIgnored(file): # check if file exists in an ignored direcory