Try harder to find rc for plan9port/wmiirc; rename rc.wmii.local to wmiirc_local.rc

This commit is contained in:
Kris Maglione 2009-10-13 05:38:54 -04:00
parent 4f8a192394
commit 6b0d71843b
4 changed files with 28 additions and 8 deletions

View File

@ -5,8 +5,8 @@ syntax: regexp
\.(diff|orig|rej|bak)$
\.(aux|idx|ilg|ind|log|toc)$
^cmd/(stfo|osd|wiwarp|setfocus)(/|$)
.*/bak/
.*_dummy\.h$
syntax: path
/bak/
_dummy\.h$
syntax: glob
config.local.mk
cmd/menu/bindings.c

View File

@ -2,7 +2,7 @@ ROOT=../..
include $(ROOT)/mk/hdr.mk
include $(ROOT)/mk/wmii.mk
# DOCS = README
DOCS = README
EXECS = wmiirc
DIR = $(ETC)/wmii$(CONFVERSION)/plan9port

View File

@ -0,0 +1,10 @@
plan9port wmiirc
================
This directory contains a Plan 9 based wmiirc script. This script was
traditionally the default wmiirc for wmii, but has been moved for
portability reasons. To run this script, either Plan 9 from User
Space[1] (plan9port for short) or 9base[2] is required. Modifications
can be placed in $home/.wmii@CONFVERSION@/wmiirc_local.rc, which must
be executable.

View File

@ -1,4 +1,14 @@
#!/usr/bin/env rc
#!/bin/sh
p="$PATH"
which rc >/dev/null || PATH="$PLAN9:$p"
which rc >/dev/null || PATH="/usr/local/plan9/bin:$p"
which rc >/dev/null || PATH="/usr/local/9/bin:$p"
which rc >/dev/null || PATH="/opt/plan9/bin:$p"
which rc >/dev/null || PATH="/opt/9/bin:$p"
which rc >/dev/null || PATH="/usr/plan9/bin:$p"
which rc >/dev/null || PATH="/usr/9/bin:$p"
test $#* '=' 0 || exec rc $0
cd
scriptname=$0
oldpath=$path; path=($PLAN9/bin $path)
@ -152,10 +162,10 @@ fn Action-status {
}
# Source Variables, &c
if(~ $0 ('' */)rc.wmii.local)
wi_notice This file should not be named rc.wmii.local
if(~ $0 ('' */)wmiirc_local.rc)
wi_notice This file should not be named wmiirc_local.rc
if not
. `{wi_script -f rc.wmii.local}
. `{wi_script -f wmiirc_local.rc}
echo $wmiinormcol | wmiir create $noticebar
# Key Bindings