[PATCH] Changed all the files so that they will live in ~/.wmii-lua instead of having a

1 view

Skip to first unread message

dcurtis

unread,

Mar 5, 2009, 4:40:09 PM3/5/09

to wmii...@googlegroups.com, Donald E Curtis

From: Donald E Curtis <dcu...@l-lnx107.divms.uiowa.edu>

diff --git a/Makefile b/Makefile
index 64ea18d..fe1be1d 100644
--- a/Makefile
+++ b/Makefile
@@ -115,8 +115,8 @@ install-variable-check:
# install in user directory
#
install-user: install-user-variable-check
-ifeq ($(shell pwd),$(wildcard ~/.wmii-3.5))
- @echo "You're already in the ~/.wmii-3.5/ directory"
+ifeq ($(shell pwd),$(wildcard ~/.wmii-lua))
+ @echo "You're already in the ~/.wmii-lua/ directory"
else
${INSTALL} -d ${ALL_HOME_DIRS}
@if test -f ${HOME_WMII}/wmiirc ; then \
diff --git a/README b/README
index a2de9da..6677903 100644
--- a/README
+++ b/README
@@ -153,7 +153,7 @@ xmodmaprc. See: contrib/remap-caps-ctrl-mod4
Configuration
-------------
All configuration of wmiirc-lua is done by editing the
-~/.wmii-3.5/wmiirc file. See doc/configuration for more help on configuring
+~/.wmii-lua/wmiirc file. See doc/configuration for more help on configuring
wmiirc-lua.

wmiirc-lua supports all the keyboard shortcuts of wmii's shell wmiirc,
@@ -162,7 +162,7 @@ the doc/key-bindings for information on how to control wmii with the
extended key bindings wmiirc-lua provides.

More advanced users may also write plugins for wmiirc-lua using the
-plugin API. Plugins live in ~/.wmii-3.5/plugins/ directory, and several
+plugin API. Plugins live in ~/.wmii-lua/plugins/ directory, and several
come with this package. See the wmii.3lua man page, and doc/plugin-api
for more information about how to write code for wmiirc-lua.

diff --git a/config.mk.dist b/config.mk.dist
index 83058a3..5c826bc 100644
--- a/config.mk.dist
+++ b/config.mk.dist
@@ -32,7 +32,7 @@ PLUGIN_LIB_DIR = ${DESTDIR}${PREFIX}/lib/lua/${LUA_VERSION}/wmii
PLUGIN_LUA_DIR = ${DESTDIR}${PREFIX}/share/lua/${LUA_VERSION}/wmii

BIN_DIR = ${DESTDIR}${PREFIX}/bin
-RC_DIR = ${DESTDIR}/etc/X11/wmii-3.5
+RC_DIR = ${DESTDIR}/etc/X11/wmii-lua
MAN_DIR = ${DESTDIR}${PREFIX}/share/man/man3
XS_DIR = ${DESTDIR}${PREFIX}/share/xsessions

@@ -48,7 +48,7 @@ ALL_INSTALL_DIRS= ${CORE_LIB_DIR} \
# ------------------------------------------------------------------------
# home directories

-HOME_WMII = ~/.wmii-3.5
+HOME_WMII = ~/.wmii-lua
HOME_CORE = ${HOME_WMII}/core
HOME_PLUGINS = ${HOME_WMII}/plugins
HOME_BIN_DIR = $(word 1,$(wildcard ~/usr/bin ~/bin) ~/bin)
diff --git a/core/wmii.lua b/core/wmii.lua
index 8d98924..ef5bb1d 100644
--- a/core/wmii.lua
+++ b/core/wmii.lua
@@ -55,7 +55,7 @@ It should be used by your wmiirc
-- MODULE SETUP
-- ========================================================================

-local wmiidir = os.getenv("HOME") .. "/.wmii-3.5"
+local wmiidir = os.getenv("HOME") .. "/.wmii-lua"
local wmiirc = wmiidir .. "/wmiirc"

package.path = wmiidir .. "/core/?.lua;" ..
@@ -143,18 +143,18 @@ local prog_hist = history.new (20)
local action_hist = history.new(10)

-- where to find plugins
-plugin_path = os.getenv("HOME") .. "/.wmii-3.5/plugins/?.so;"
- .. os.getenv("HOME") .. "/.wmii-3.5/plugins/?.lua;"
+plugin_path = os.getenv("HOME") .. "/.wmii-lua/plugins/?.so;"
+ .. os.getenv("HOME") .. "/.wmii-lua/plugins/?.lua;"
.. "/usr/local/lib/lua/5.1/wmii/?.so;"
.. "/usr/local/share/lua/5.1/wmii/?.lua;"
.. "/usr/lib/lua/5.1/wmii/?.so;"
.. "/usr/share/lua/5.1/wmii/?.lua"

-- where to find wmiirc (see find_wmiirc())
-wmiirc_path = os.getenv("HOME") .. "/.wmii-3.5/wmiirc.lua;"
- .. os.getenv("HOME") .. "/.wmii-3.5/wmiirc;"
- .. "/etc/X11/wmii-3.5/wmiirc.lua;"
- .. "/etc/X11/wmii-3.5/wmiirc"
+wmiirc_path = os.getenv("HOME") .. "/.wmii-lua/wmiirc.lua;"
+ .. os.getenv("HOME") .. "/.wmii-lua/wmiirc;"
+ .. "/etc/X11/wmii-lua/wmiirc.lua;"
+ .. "/etc/X11/wmii-lua/wmiirc"

-- ========================================================================
-- LOCAL HELPERS
@@ -182,7 +182,7 @@ end

=item find_wmiirc ( )

-Locates the wmiirc script. It looks in ~/.wmii-3.5 and /etc/X11/wmii-3.5
+Locates the wmiirc script. It looks in ~/.wmii-lua and /etc/X11/wmii-lua
for the first lua script bearing the name wmiirc.lua or wmiirc. Returns
first match.

diff --git a/doc/bundled-plugins b/doc/bundled-plugins
index cc8be0d..8775f3c 100644
--- a/doc/bundled-plugins
+++ b/doc/bundled-plugins
@@ -2,7 +2,7 @@ About
======
wmiirc-lua bundles some plugins with the distribution and this document
briefly describes each. The plugin files themselves are located in
-~/.wmii-3.5/plugins/ and are documented in more detail through comments.
+~/.wmii-lua/plugins/ and are documented in more detail through comments.

browser
========
diff --git a/doc/configuration b/doc/configuration
index 4f43df5..63a808b 100644
--- a/doc/configuration
+++ b/doc/configuration
@@ -1,6 +1,6 @@
About
======
-All files in wmiirc-lua are stored in ~/.wmii-3.5. You can read a bit
+All files in wmiirc-lua are stored in ~/.wmii-lua. You can read a bit
more about this in doc/dir-structure. wmiirc-lua configuration is stored
in wmiirc and is a lua script.

@@ -22,12 +22,12 @@ to look for it.

-- initialize wmii library
package.path = package.path
- .. ";" .. os.getenv("HOME") .. "/.wmii-3.5/core/?.lua"
- .. ";" .. os.getenv("HOME") .. "/.wmii-3.5/plugins/?.lua"
+ .. ";" .. os.getenv("HOME") .. "/.wmii-lua/core/?.lua"
+ .. ";" .. os.getenv("HOME") .. "/.wmii-lua/plugins/?.lua"
require "wmii"

The lines above sets a new package.path which will look for lua
-libraries in ~/.wmii-3.5/core/ and ~/.wmii-3.5/plugins/.
+libraries in ~/.wmii-lua/core/ and ~/.wmii-lua/plugins/.

Loading the 'wmii' lua library does not cause any events to be handled
yet. To handle events you need to issue the wmii.run_event_loop() call,
@@ -120,7 +120,7 @@ Adding plugins
===============
wmiirc-lua is extendible through plugin modules. Some plugins are
shipped with the package, others you can get from 3rd party sources.
-New plugins should be placed in ~/.wmii-3.5/plugins/ directory.
+New plugins should be placed in ~/.wmii-lua/plugins/ directory.
See doc/plugin-api to learn more about writing plugins.

To load plugins into wmiirc, simply call the load_plugin function:
diff --git a/doc/dir-structure b/doc/dir-structure
index 0630a44..c66964c 100644
--- a/doc/dir-structure
+++ b/doc/dir-structure
@@ -1,6 +1,6 @@
-This file describes the directory structure for ~/.wmii-3.5
+This file describes the directory structure for ~/.wmii-lua

-${HOME}/.wmii-3.5
+${HOME}/.wmii-lua
|--- wmiirc <-- configuration file
|--- core
| |--- wmii.lua <-- core lua bits
@@ -14,7 +14,7 @@ In 0.2 the plugin directory will be extended to allow for plugins to
have their own directory and they will be loaded using
wmii.load_plugin("name") and not require "name".

-${HOME}/.wmii-3.5
+${HOME}/.wmii-lua
...
...
`--- plugin
diff --git a/install-wmiirc-lua b/install-wmiirc-lua
index 88500ee..0948925 100755
--- a/install-wmiirc-lua
+++ b/install-wmiirc-lua
@@ -1,12 +1,12 @@
#!/bin/sh
# Copyright (c) 2007, Bart Trojanowski <ba...@jukie.net>
#
-# This script installs wmiirc-lua files into $HOME/.wmii-3.5
+# This script installs wmiirc-lua files into $HOME/.wmii-lua

set -e

-SRC_DIR="/etc/X11/wmii-3.5"
-DST_DIR="${HOME}/.wmii-3.5"
+SRC_DIR="/etc/wmii-lua"
+DST_DIR="${HOME}/.wmii-lua"

SRC_WMIIRC="${SRC_DIR}/wmiirc.lua"
DST_WMIIRC="${DST_DIR}/wmiirc"
diff --git a/wmii-lua b/wmii-lua
index e48d173..a436f30 100755
--- a/wmii-lua
+++ b/wmii-lua
@@ -6,10 +6,10 @@

# we will look for wmiirc in these directories
POSSIBLE_WMIIRC="
-${HOME}/.wmii-3.5/wmiirc.lua
-${HOME}/.wmii-3.5/wmiirc
-/etc/X11/wmii-3.5/wmiirc.lua
-/etc/X11/wmii-3.5/wmiirc
+${HOME}/.wmii-lua/wmiirc.lua
+${HOME}/.wmii-lua/wmiirc
+/etc/wmii-lua/wmiirc.lua
+/etc/wmii-lua/wmiirc
"

# try to find the best wmiirc written in lua
diff --git a/wmiirc.lua b/wmiirc.lua
index c444bfe..25db765 100755
--- a/wmiirc.lua
+++ b/wmiirc.lua
@@ -14,7 +14,7 @@
io.stderr:write ("----------------------------------------------\n")

-- load wmii.lua
-local wmiidir = os.getenv("HOME") .. "/.wmii-3.5"
+local wmiidir = os.getenv("HOME") .. "/.wmii-lua"
package.path = wmiidir .. "/core/?.lua;" ..
wmiidir .. "/plugins/?.lua;" ..
package.path
--
1.5.5.1

Reply all

Reply to author

Forward

0 new messages