Compare commits

..

No commits in common. "453b07f4d62a47ed99f797ff6244c2607b9a761c" and "952526f495d8cb993cdb30064c0c52ff0a11a42c" have entirely different histories.

5 changed files with 20 additions and 28 deletions

1
.gitignore vendored
View file

@ -65,4 +65,3 @@ CTestTestfile.cmake
_deps
build/
dist/

View file

@ -31,17 +31,13 @@ ${BUILD_DIR}: ${OBJ}
clean:
rm -rf ${OBJ_DIR}
dist: ${BUILD_DIR} archy-dwm.desktop
dist: clean
mkdir -p archy-dwm_${VERSION}
cp -R LICENSE README.md ${BUILD_DIR} ${OBJ_DIR}/archy-dwm.desktop archy-dwm.1 dwm.png 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}
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 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
@ -51,22 +47,19 @@ install: all
sed "s/VERSION/${VERSION}/g" < archy-dwm.1 > ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1
chmod 644 ${DESTDIR}${MANPREFIX}/man1/archy-dwm.1
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
desktop:
full_path=/usr/share/xsessions/archy-dwm.desktop
mkdir -p /usr/share/xsessions
cat <<EOT >> ${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"
uninstall:
rm -f ${DESTDIR}${PREFIX}/bin/archy-dwm \
${DESTDIR}${MANPREFIX}/man1/archy-dwm.1 \
${DESTDIR}${PREFIX}/share/xsessions/archy-dwm.desktop
${DESTDIR}${MANPREFIX}/man1/archy-dwm.1
.PHONY: all options clean dist install uninstall

View file

@ -1,5 +1,5 @@
# Archy DWM version
VERSION = 1.0.0
# yo-dwm version
VERSION = 6.4-0.2.1
# Customize below to fit your system

View file

@ -2359,14 +2359,14 @@ zoom(const Arg *arg) {
int
main(int argc, char *argv[]) {
if (argc == 2 && !strcmp("-v", argv[1]))
die("archy dwm-"
die("dwm-"
VERSION);
else if (argc != 1)
die("usage: archy-dwm [-v]");
die("usage: dwm [-v]");
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fputs("warning: no locale support\n", stderr);
if (!(dpy = XOpenDisplay(NULL)))
die("archy-dwm: cannot open display");
die("dwm: cannot open display");
checkotherwm();
autostart_exec();
setup();

View file

@ -31,7 +31,7 @@ static const char dmenufont[] = "monospace:size=8";
// Autostart programs
static const char *const autostart[] = {
// Start my build of slstatus
"archy-slstatus", NULL,
"yo-slstatus", NULL,
NULL /* terminate */
};