Attachment #92483 for bug #117143

Lines 18-24 Link Here

(-)wmii-3.1.old/Makefile (-1 / +1 lines)
18	@echo "LDFLAGS = ${LDFLAGS}"	18	@echo "LDFLAGS = ${LDFLAGS}"
19	@echo "CC = ${CC}"	19	@echo "CC = ${CC}"
20	@for i in ${SUBDIRS} cmd/wm; do \	20	@for i in ${SUBDIRS} cmd/wm; do \
21	(cd $$i; make) \	21	(cd $$i; $(MAKE)) \
22	done	22	done
23		23
24	dist: clean	24	dist: clean





wmiiwm -c || exit 1

if [ -d $HOME/.wmii-3 ]; then
	SHOW_WELCOME=false
fi

OLD_PATH=$PATH export OLD_PATH
PATH=$HOME/.wmii-3:CONFPREFIX/wmii-3:$PATH export PATH
NAMESPACE=$HOME/.wmii-3/ns${DISPLAY%.0}
WMII_ADDRESS=unix!$NAMESPACE/wmii export WMII_ADDRESS

mkdir -p -m 700 $NAMESPACE 2>/dev/null
wmiiwm -a $WMII_ADDRESS &
wmiiwmpid=$!
$SHOW_WELCOME && welcome
wmiirc &
wait $wmiiwmpid

Lines 42-48 Link Here

(-)wmii-3.1.old/cmd/wm/wmii.1 (-1 / +1 lines)
42	bindings, the bar labels, etc.	42	bindings, the bar labels, etc.
43	.SH FILES	43	.SH FILES
44	.TP	44	.TP
45	/tmp/ns.$USER.${DISPLAY%.0}/wmii	45	$HOME/.wmii-3/ns.${DISPLAY%.0}/wmii
46	The wmii socket file which provides a 9P service.	46	The wmii socket file which provides a 9P service.
47	.TP	47	.TP
48	CONFPREFIX/wmii-3	48	CONFPREFIX/wmii-3

Lines 51-57 Link Here

(-)wmii-3.1.old/rc/wmiirc (-1 / +1 lines)
51	# MISC	51	# MISC
52	xsetroot -solid '#333333'	52	xsetroot -solid '#333333'
53	status &	53	status &
54	PROGS_FILE=`mktemp /tmp/.wmiimenu.proglist.XXXXXX` \|\| exit 2	54	PROGS_FILE=$HOME/.wmii-3/wmiimenu.proglist
55	proglist `echo "$OLD_PATH" \| tr : ' '` >$PROGS_FILE &	55	proglist `echo "$OLD_PATH" \| tr : ' '` >$PROGS_FILE &
56		56
57	# SHORTCUTS	57	# SHORTCUTS

Return to bug 117143

Lines 3-15 Link Here

(-)wmii-3.1.old/cmd/wm/wmii (-3 / +8 lines)
3		3
4	wmiiwm -c \|\| exit 1	4	wmiiwm -c \|\| exit 1
5		5
		6	if [ -d $HOME/.wmii-3 ]; then
		7	SHOW_WELCOME=false
		8	fi
		9
6	OLD_PATH=$PATH export OLD_PATH	10	OLD_PATH=$PATH export OLD_PATH
7	PATH=$HOME/.wmii-3:CONFPREFIX/wmii-3:$PATH export PATH	11	PATH=$HOME/.wmii-3:CONFPREFIX/wmii-3:$PATH export PATH
8	WMII_ADDRESS=unix!/tmp/ns.$USER.${DISPLAY%.0}/wmii export WMII_ADDRESS	12	NAMESPACE=$HOME/.wmii-3/ns${DISPLAY%.0}
		13	WMII_ADDRESS=unix!$NAMESPACE/wmii export WMII_ADDRESS
9		14
10	mkdir -m 700 /tmp/ns.$USER.${DISPLAY%.0} 2>/dev/null	15	mkdir -p -m 700 $NAMESPACE 2>/dev/null
11	wmiiwm -a $WMII_ADDRESS &	16	wmiiwm -a $WMII_ADDRESS &
12	wmiiwmpid=$!	17	wmiiwmpid=$!
13	mkdir $HOME/.wmii-3 2>/dev/null && welcome &	18	$SHOW_WELCOME && welcome
14	wmiirc &	19	wmiirc &
15	wait $wmiiwmpid	20	wait $wmiiwmpid