speedie/speedwm-personal
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Rename status -> speedwm-stellar to prevent possible naming conflicts if

Browse source 
/usr/bin/status already exists
This commit is contained in:
speediegq 2022-10-24 18:10:14 +02:00
parent 1da301e9b6
commit b4358f4abc
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -44,7 +44,7 @@ dist: clean
mkdir -p .speedwm
mkdir -p speedwm-${VERSION}
[ -f options.h_settings.patch ] && mv *.patch docs/*.def* .speedwm/ || :
cp -R *.mk *.c *.h *.png docs/ modules/ scripts/ toggle/ status LICENSE Makefile speedwm-${VERSION}
cp -R *.mk *.c *.h *.png docs/ modules/ scripts/ toggle/ LICENSE Makefile speedwm-${VERSION}
tar -cf speedwm-${VERSION}.tar speedwm-${VERSION}
gzip speedwm-${VERSION}.tar
rm -rf speedwm-${VERSION} speedwm
@ -81,7 +81,6 @@ install_only_misc:
[ -f docs/colors.def.h ] || cp -f colors.h docs/colors.def.h || :
[ -f docs/colors.def.h ] || cp -f colors.h docs/colors.def.h || :
[ -f docs/statusbar.def.h ] || cp -f statusbar.h docs/statusbar.def.h || :
[ -f docs/status.def ] || cp -f status docs/status.def || :
mkdir -p ${DESTDIR}${PREFIX}/bin
mkdir -p ${DESTDIR}${PREFIX}/share/speedwm
cp -f docs/keybinds ${DESTDIR}${PREFIX}/share/speedwm/keybinds
@ -89,7 +88,6 @@ install_only_misc:
cp -f docs/doc-* ${DESTDIR}${PREFIX}/share/speedwm/
cp -f docs/example.* ${DESTDIR}${PREFIX}/share/speedwm/
cp -f scripts/speedwm* ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/speedwm*
cp -f status ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/status
chmod +x ./scripts/speedwm-compatcheck
./scripts/speedwm-compatcheck
make modules_install
@ -118,7 +116,6 @@ install: all
[ -f docs/colors.def.h ] || cp -f colors.h docs/colors.def.h || :
[ -f docs/colors.def.h ] || cp -f colors.h docs/colors.def.h || :
[ -f docs/statusbar.def.h ] || cp -f statusbar.h docs/statusbar.def.h || :
[ -f docs/status.def ] || cp -f status docs/status.def || :
[ -f docs/entry.desktop ] && cp -f docs/entry.desktop ${DESTDIR}${PREFIX}/share/xsessions/speedwm.desktop || :
[ -f speedwm-msg ] && chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm-msg || :
[ -f speedwm.png ] && cp -f speedwm.png ${DESTDIR}${PREFIX}/share/pixmaps/speedwm.png || :
@ -127,7 +124,6 @@ install: all
cp -f docs/doc-* ${DESTDIR}${PREFIX}/share/speedwm/
cp -f docs/example.* ${DESTDIR}${PREFIX}/share/speedwm/
cp -f scripts/speedwm* ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/speedwm*
cp -f status ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/status
chmod +x ./scripts/speedwm-compatcheck
chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm
./scripts/speedwm-compatcheck
@ -141,7 +137,7 @@ modules_install:
chmod +x ${DESTDIR}${PREFIX}/bin/module_*
uninstall:
rm -rf ${DESTDIR}${PREFIX}/bin/speedwm* ${DESTDIR}${PREFIX}/bin/status
rm -rf ${DESTDIR}${PREFIX}/bin/speedwm* ${DESTDIR}${PREFIX}/bin/speedwm-stellar
docs:
chmod +x scripts/speedwm-help

3
scripts/mkpatch
View file

@ -17,7 +17,6 @@ CP() {
cp docs/actions.def.h /tmp/actions.h
cp docs/colors.def.h /tmp/colors.h
cp docs/statusbar.def.h /tmp/statusbar.h
cp docs/status.def /tmp/status
}
MKDIFF() {
@ -35,7 +34,6 @@ MKDIFF() {
diff -up ./actions.h $CD/actions.h > $CD/actions.h_settings.patch && echo "Created actions.h patch (see actions.h_settings.patch)"
diff -up ./colors.h $CD/colors.h > $CD/colors.h_settings.patch && echo "Created colors.h patch (see colors.h_settings.patch)"
diff -up ./statusbar.h $CD/statusbar.h > $CD/statusbar.h_settings.patch && echo "Created statusbar.h patch (see statusbar.h_settings.patch)"
diff -up ./status $CD/status > $CD/status_settings.patch && echo "Created status patch (see status_settings.patch)"
# Delete
rm -f /tmp/options.h
@ -60,7 +58,6 @@ if [ "$1" = "-p" ]; then
patch < actions.h_settings.patch
patch < colors.h_settings.patch
patch < statusbar.h_settings.patch
patch < status_settings.patch
cd $CD
exit 0
fi

0
status → scripts/speedwm-stellar
View file

2
scripts/speedwm_status
View file

@ -2,7 +2,7 @@
# speedwm_status
# status bar manager
STATUSBAR="status"
STATUSBAR="speedwm-stellar"
IN_ARGS="$@"
statusfunc() {