From 8cd2cb51a9dfcf72f0ce0d1891fa545cb0a4c2a8 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 28 Jun 2020 17:34:50 -0400 Subject: [PATCH 1/3] WIP: improve Makefile installation Remove the webkit greeter elements as that is not really supported. Add initial installation commands for Plus! script. Still need to troubleshoot gtk directory permissions issues. --- .gitignore | 2 ++ Makefile | 43 +++++++++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..809104c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.*.swp +debian diff --git a/Makefile b/Makefile index 2e43561..231f41f 100644 --- a/Makefile +++ b/Makefile @@ -50,20 +50,31 @@ xargsbin :=$(shell which xargs) .PHONY: clean install install_files build_man uninstall list deplist deplist_opts +all: + @${echobin} "No compilation for this project." + list: @$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | ${awkbin} -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | ${sortbin} | ${grepbin} -E -v -e '^[^[:alnum:]]' -e '^$@$$' install: install_all -install_all: install_cursors install_doc install_fonts install_greeter install_gtk_theme install_icons install_login_sound install_boot_screen +install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_login_sound install_boot_screen install_plus install_cursors: - ${installbin} -dm0755 ${ICONSDIR}/Chicago95_Cursor_Black \ + ${installbin} -dm0755 \ + ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \ + ${ICONSDIR}/Chicago95_Cursor_Black \ ${ICONSDIR}/Chicago95_Cursor_White \ - ${ICONSDIR}/Chicago95_Emerald + ${ICONSDIR}/Chicago95_Emerald \ + ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \ + ${ICONSDIR}/Chicago95\ Standard\ Cursors \ + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_Black/* ${ICONSDIR}/Chicago95_Cursor_Black ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_White/* ${ICONSDIR}/Chicago95_Cursor_White ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Emerald/* ${ICONSDIR}/Chicago95_Emerald + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Animated\ Hourglass\ Cursors/* ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors/* ${ICONSDIR}/Chicago95\ Standard\ Cursors + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors\ Black/* ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black ${findbin} ${ICONSDIR}/Chicago95* ! -type d -exec ${chmodbin} 0644 {} + install_doc: @@ -77,16 +88,12 @@ install_fonts: ${installbin} -dm0755 ${FONTDIR}/truetype ${installbin} -m0644 -t ${FONTDIR}/truetype ${SRCDIR}/Fonts/vga_font/*ttf -install_greeter: - ${installbin} -dm0755 ${SHAREDIR}/lightdm-webkit/themes - ${cpbin} -pr ${SRCDIR}/Lightdm/Chicago95 ${SHAREDIR}/lightdm-webkit/themes/ - ${findbin} ${SHAREDIR}/lightdm-webkit/themes/Chicago95 ! -type d -exec ${chmodbin} 0644 {} + - install_gtk_theme: ${installbin} -dm0755 ${THEMESDIR} ${cpbin} -pr ${SRCDIR}/Theme/Chicago95 ${THEMESDIR} ${rmbin} -r ${THEMESDIR}/Chicago95/misc ${findbin} ${THEMESDIR}/Chicago95 ! -type d -exec ${chmodbin} 0644 {} + + ${findbin} ${THEMESDIR}/Chicago95 -type d -exec ${chmodbin} 0755 {} + @# xfce4-terminal theme ${installbin} -dm0755 ${SHAREDIR}/xfce4/terminal/colorschemes ${installbin} -m0644 -t ${SHAREDIR}/xfce4/terminal/colorschemes ${SRCDIR}/Extras/Chicago95.theme @@ -108,10 +115,24 @@ install_boot_screen: ${installbin} -m0644 -t ${SHAREDIR}/plymouth/themes/Chicago95 ${SRCDIR}/Plymouth/Chicago95/* ${installbin} -m0644 -t ${SHAREDIR}/plymouth/themes/RetroTux ${SRCDIR}/Plymouth/RetroTux/* +install_plus: + ${installbin} -dm0755 ${SHAREDIR}/chicago95-theme-plus/assets ${BINDIR} ${LIBEXECDIR}/chicago95-theme-plus ${DOCDIR}/demo + ${installbin} -m0755 -t ${SHAREDIR}/chicago95-theme-plus/assets ${SRCDIR}/Plus/assets/* + ${installbin} -m0755 ${SRCDIR}/Plus/ChicagoPlus.py ${BINDIR}/ChicagoPlus + ${installbin} -m0755 ${SRCDIR}/Plus/PlusGUI.py ${BINDIR}/PlusGUI + ${installbin} -m0644 -t ${LIBEXECDIR}/chicago95-theme-plus ${SRCDIR}/Plus/pluslib.py ${SRCDIR}/Plus/plus.glade + ${installbin} -m0644 ${SRCDIR}/Plus/README.MD ${DOCDIR}/Plus-README.MD + ${installbin} -m0644 -t ${DOCDIR} ${SRCDIR}/Plus/*.png + ${installbin} -m0644 -t ${DOCDIR}/demo ${SRCDIR}/Plus/demo/* + uninstall: - ${rmbin} -r ${ICONSDIR}/Chicago95_Cursor_Black \ + ${rmbin} -rf \ + ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \ + ${ICONSDIR}/Chicago95_Cursor_Black \ ${ICONSDIR}/Chicago95_Cursor_White \ ${ICONSDIR}/Chicago95_Emerald \ + ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \ + ${ICONSDIR}/Chicago95\ Standard\ Cursors \ ${DOCDIR} \ ${FONTDIR}/truetype/LessPerfectDOSVGA.ttf \ ${FONTDIR}/truetype/MorePerfectDOSVGA.ttf \ @@ -119,7 +140,9 @@ uninstall: ${THEMESDIR}/Chicago95 ${SHAREDIR}/xfce4/terminal/colorschemes/Chicago95.theme \ ${ICONSDIR}/Chicago95 ${ICONSDIR}/Chicago95-tux \ ${SOUNDSDIR}/Chicago95 \ - ${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux 2>/dev/null || : + ${LIBEXECDIR}/chicago95-theme-plus ${BINDIR}/ChicagoPlus ${BINDIR}/PlusGUI \ + ${SHAREDIR}/chicago95-theme-plus \ + ${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux clean: -@${echobin} "target $@ not implemented yet! Gotta say unh." && ${falsebin} From 52c5eb8ed1ebde4498c07c58eb51e6306f04e774 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 29 Jun 2020 09:07:30 -0400 Subject: [PATCH 2/3] improve installation Add use_underscores so dpkg deployment works. Add startup sound .desktop file for xdg/autostart. --- Makefile | 45 ++++++++++++++++++++------------ sounds/chicago95-startup.desktop | 8 ++++++ 2 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 sounds/chicago95-startup.desktop diff --git a/Makefile b/Makefile index 231f41f..6a26fae 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,12 @@ # History: # Usage: # Reference: +# spaces and underscores https://ftp.gnu.org/old-gnu/Manuals/make-3.79.1/html_chapter/make_6.html # Improve: # Dependencies: APPNAME = chicago95 -APPVERSION = 0.0.2beta +APPVERSION = 0.0.2 SRCDIR = $(CURDIR) prefix = /usr SYSCONFDIR = $(DESTDIR)/etc @@ -48,8 +49,16 @@ truebin :=$(shell which true) uniqbin :=$(shell which uniq) xargsbin :=$(shell which xargs) +use_underscores ?= NO + .PHONY: clean install install_files build_man uninstall list deplist deplist_opts +nullstring := +space :=\ $(nullstring)# end of the line +ifeq ($(use_underscores),YES) +space = _ +endif + all: @${echobin} "No compilation for this project." @@ -58,23 +67,23 @@ list: install: install_all -install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_login_sound install_boot_screen install_plus +install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_sounds install_login_sound install_boot_screen install_plus install_cursors: ${installbin} -dm0755 \ - ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \ + ${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors \ ${ICONSDIR}/Chicago95_Cursor_Black \ ${ICONSDIR}/Chicago95_Cursor_White \ ${ICONSDIR}/Chicago95_Emerald \ - ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \ - ${ICONSDIR}/Chicago95\ Standard\ Cursors \ + ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors$(space)Black \ + ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors \ + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Animated\ Hourglass\ Cursors/* ${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_Black/* ${ICONSDIR}/Chicago95_Cursor_Black ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_White/* ${ICONSDIR}/Chicago95_Cursor_White ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Emerald/* ${ICONSDIR}/Chicago95_Emerald - ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Animated\ Hourglass\ Cursors/* ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors - ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors/* ${ICONSDIR}/Chicago95\ Standard\ Cursors - ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors\ Black/* ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors/* ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors + ${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors\ Black/* ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors$(space)Black ${findbin} ${ICONSDIR}/Chicago95* ! -type d -exec ${chmodbin} 0644 {} + install_doc: @@ -92,8 +101,8 @@ install_gtk_theme: ${installbin} -dm0755 ${THEMESDIR} ${cpbin} -pr ${SRCDIR}/Theme/Chicago95 ${THEMESDIR} ${rmbin} -r ${THEMESDIR}/Chicago95/misc - ${findbin} ${THEMESDIR}/Chicago95 ! -type d -exec ${chmodbin} 0644 {} + - ${findbin} ${THEMESDIR}/Chicago95 -type d -exec ${chmodbin} 0755 {} + + ${findbin} ${THEMESDIR}/Chicago95 ! -type d -exec ${chmodbin} 0644 {} + || : + ${findbin} ${THEMESDIR}/Chicago95 -type d -exec ${chmodbin} 0755 {} + || : @# xfce4-terminal theme ${installbin} -dm0755 ${SHAREDIR}/xfce4/terminal/colorschemes ${installbin} -m0644 -t ${SHAREDIR}/xfce4/terminal/colorschemes ${SRCDIR}/Extras/Chicago95.theme @@ -103,12 +112,16 @@ install_icons: ${cpbin} -pr ${SRCDIR}/Icons/* ${ICONSDIR}/ ${findbin} ${ICONSDIR}/Chicago95* ! -type d ! -type l -exec ${chmodbin} 0644 {} + +install_sounds: + ${installbin} -dm0755 ${SOUNDSDIR}/Chicago95/stereo + ${installbin} -m0644 -t ${SOUNDSDIR}/Chicago95/stereo ${SRCDIR}/sounds/Chicago95/stereo/* + ${installbin} -m0644 -t ${SOUNDSDIR}/Chicago95 ${SRCDIR}/sounds/Chicago95/index.theme + install_login_sound: - ${installbin} -dm0755 ${SOUNDSDIR}/Chicago95 - # pending addition of debian/chicago95-startup.desktop to source ${XDGAUTODIR} + ${installbin} -dm0755 ${SOUNDSDIR}/Chicago95 ${XDGAUTODIR} ${installbin} -m0644 ${SRCDIR}/Extras/Microsoft\ Windows\ 95\ Startup\ Sound.ogg ${SOUNDSDIR}/Chicago95/startup.ogg # pending addition of debian/chicago95-startup.desktop to source ${XDGAUTODIR} - #${installbin} -m0644 -t ${XDGAUTODIR} ${SRCDIR}/Extras/chicago95-startup.desktop + ${installbin} -m0644 -t ${XDGAUTODIR} ${SRCDIR}/sounds/chicago95-startup.desktop install_boot_screen: ${installbin} -dm0755 ${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux @@ -127,12 +140,12 @@ install_plus: uninstall: ${rmbin} -rf \ - ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \ + ${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors \ ${ICONSDIR}/Chicago95_Cursor_Black \ ${ICONSDIR}/Chicago95_Cursor_White \ ${ICONSDIR}/Chicago95_Emerald \ - ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \ - ${ICONSDIR}/Chicago95\ Standard\ Cursors \ + ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors$(space)Black \ + ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors \ ${DOCDIR} \ ${FONTDIR}/truetype/LessPerfectDOSVGA.ttf \ ${FONTDIR}/truetype/MorePerfectDOSVGA.ttf \ diff --git a/sounds/chicago95-startup.desktop b/sounds/chicago95-startup.desktop new file mode 100644 index 0000000..2253c2b --- /dev/null +++ b/sounds/chicago95-startup.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Chicago95 startup sound +Exec=play /usr/share/sounds/Chicago95/startup.ogg +NoDisplay=true +Terminal=false +Categories= +GenericName=startup sound From 945aef0dd4d54de1c72ecc8afd954ba24e989571 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 29 Jun 2020 09:14:55 -0400 Subject: [PATCH 3/3] remove outdated comment --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 6a26fae..335d100 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,6 @@ install_sounds: install_login_sound: ${installbin} -dm0755 ${SOUNDSDIR}/Chicago95 ${XDGAUTODIR} ${installbin} -m0644 ${SRCDIR}/Extras/Microsoft\ Windows\ 95\ Startup\ Sound.ogg ${SOUNDSDIR}/Chicago95/startup.ogg - # pending addition of debian/chicago95-startup.desktop to source ${XDGAUTODIR} ${installbin} -m0644 -t ${XDGAUTODIR} ${SRCDIR}/sounds/chicago95-startup.desktop install_boot_screen: