From 5e289b843843e66921728b0c418c4de17d9b20fa Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 11 May 2023 18:52:06 +0300 Subject: [PATCH 1/5] [fix/update] Update the slstatus name --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index c0c10ac..935d32f 100644 --- a/src/config.h +++ b/src/config.h @@ -31,7 +31,7 @@ static const char dmenufont[] = "monospace:size=8"; // Autostart programs static const char *const autostart[] = { // Start my build of slstatus - "yo-slstatus", NULL, + "archy-slstatus", NULL, NULL /* terminate */ }; From 8f4a20dd4e736e3beb0262751235c420707b9266 Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 11 May 2023 19:02:33 +0300 Subject: [PATCH 2/5] [fix/debloy] set the version --- config.mk | 4 ++-- src/archy_dwm.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.mk b/config.mk index 9c19603..b1d4a03 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ -# yo-dwm version -VERSION = 6.4-0.2.1 +# Archy DWM version +VERSION = 1.0.0 # Customize below to fit your system diff --git a/src/archy_dwm.c b/src/archy_dwm.c index f3640ea..2fdb156 100644 --- a/src/archy_dwm.c +++ b/src/archy_dwm.c @@ -2359,14 +2359,14 @@ zoom(const Arg *arg) { int main(int argc, char *argv[]) { if (argc == 2 && !strcmp("-v", argv[1])) - die("dwm-" + die("archy dwm-" VERSION); else if (argc != 1) - die("usage: dwm [-v]"); + die("usage: archy-dwm [-v]"); if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) fputs("warning: no locale support\n", stderr); if (!(dpy = XOpenDisplay(NULL))) - die("dwm: cannot open display"); + die("archy-dwm: cannot open display"); checkotherwm(); autostart_exec(); setup(); From fa1aa3e444e30a73dfd03c5b1fb6dd4cacfd6ceb Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 11 May 2023 21:16:12 +0300 Subject: [PATCH 3/5] [fix/add] improve the dist task and create the archy-dwm.desktop task --- Makefile | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 020350c..0f81813 100644 --- a/Makefile +++ b/Makefile @@ -31,13 +31,15 @@ ${BUILD_DIR}: ${OBJ} clean: rm -rf ${OBJ_DIR} -dist: clean +dist: build/archy-dwm archy-dwm.desktop mkdir -p archy-dwm_${VERSION} - cp -R LICENSE Makefile README config.def.h config.mk \ - archy-dwm.1 drw.h util.h ${SRC} dwm.png transient.c archy-dwm_${VERSION} + cp -R LICENSE ${BUILD_DIR} ${OBJ_DIR}/archy-dwm.desktop archy-dwm.1 dwm.png archy-dwm_${VERSION} tar -cf archy-dwm_${VERSION}.tar archy-dwm_${VERSION} gzip archy-dwm_${VERSION}.tar rm -rf archy-dwm_${VERSION} + echo "The tarball is ready." + printf "Tarball size: %s\n" $$(du -h archy-dwm_${VERSION}.tar.gz | cut -f1) + printf "Tarball hash: %s\n" $$(sha256sum archy-dwm_${VERSION}.tar.gz | cut -d' ' -f1) install: all mkdir -p ${DESTDIR}${PREFIX}/bin @@ -47,19 +49,22 @@ install: all sed "s/VERSION/${VERSION}/g" < archy-dwm.1 > ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1 chmod 644 ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1 -desktop: - full_path=/usr/share/xsessions/archy-dwm.desktop - mkdir -p /usr/share/xsessions - cat <> ${full_path} - [Desktop Entry] - Type=XSession - Exec=/usr/local/bin/archy-dwm - DesktopNames=archy-dwm - Name=archy-dwm - Comment="A dynamic window manager for X" +archy-dwm.desktop: + mkdir -p "$(OBJ_DIR)" + echo "[Desktop Entry]" > "$(OBJ_DIR)/archy-dwm.desktop" + echo "Type=XSession" >> "$(OBJ_DIR)/archy-dwm.desktop" + echo "Exec=$(DESTDIR)$(PREFIX)/bin/archy-dwm" >> "$(OBJ_DIR)/archy-dwm.desktop" + echo "DesktopNames=archy-dwm" >> "$(OBJ_DIR)/archy-dwm.desktop" + echo "Name=archy-dwm" >> "$(OBJ_DIR)/archy-dwm.desktop" + echo "Comment=\"A dynamic window manager for X\"" >> "$(OBJ_DIR)/archy-dwm.desktop" + +desktop: archy-dwm.desktop + mkdir -p ${DESTDIR}${PREFIX}/share/xsessions + cp "$(OBJ_DIR)/archy-dwm.desktop" ${DESTDIR}${PREFIX}/share/xsessions/archy-dwm.desktop uninstall: rm -f ${DESTDIR}${PREFIX}/bin/archy-dwm \ - ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1 + ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1 \ + ${DESTDIR}${PREFIX}/share/xsessions/archy-dwm.desktop .PHONY: all options clean dist install uninstall From f36751844308263a6023cd15d2e836c52e980d9f Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 11 May 2023 21:46:45 +0300 Subject: [PATCH 4/5] [fix/add] improve the dist task --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0f81813..090c0a8 100644 --- a/Makefile +++ b/Makefile @@ -31,15 +31,17 @@ ${BUILD_DIR}: ${OBJ} clean: rm -rf ${OBJ_DIR} -dist: build/archy-dwm archy-dwm.desktop +dist: ${BUILD_DIR} archy-dwm.desktop mkdir -p archy-dwm_${VERSION} - cp -R LICENSE ${BUILD_DIR} ${OBJ_DIR}/archy-dwm.desktop archy-dwm.1 dwm.png archy-dwm_${VERSION} + cp -R LICENSE README.md ${BUILD_DIR} ${OBJ_DIR}/archy-dwm.desktop archy-dwm.1 dwm.png archy-dwm_${VERSION} tar -cf archy-dwm_${VERSION}.tar archy-dwm_${VERSION} gzip archy-dwm_${VERSION}.tar rm -rf archy-dwm_${VERSION} + mkdir -p dist + mv archy-dwm_${VERSION}.tar.gz dist echo "The tarball is ready." - printf "Tarball size: %s\n" $$(du -h archy-dwm_${VERSION}.tar.gz | cut -f1) - printf "Tarball hash: %s\n" $$(sha256sum archy-dwm_${VERSION}.tar.gz | cut -d' ' -f1) + printf "Tarball size: %s\n" $$(du -h dist/archy-dwm_${VERSION}.tar.gz | cut -f1) + printf "Tarball hash: %s\n" $$(sha256sum dist/archy-dwm_${VERSION}.tar.gz) install: all mkdir -p ${DESTDIR}${PREFIX}/bin From 453b07f4d62a47ed99f797ff6244c2607b9a761c Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 11 May 2023 21:51:29 +0300 Subject: [PATCH 5/5] [vcs] ignore the dist dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 825a67c..efe4a67 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ CTestTestfile.cmake _deps build/ +dist/