On Tue, Jun 03, 2003 at 12:54:05AM +0300, Tuomo Valkonen wrote:
> On Mon, Jun 02, 2003 at 11:33:40PM +0200, Rasmus Meldgaard wrote:
> > I can't get it to work, every i try to use a QueryLib.query_* there is
> > using one of the ion-* helper programs (there use ion-runinxterm), i
> > got the error: exec: ion-runinxterm: not found.
>
> Ok, the references in other scripts need to be updated too..
something like this?
--
Rasmus Meldgaard
"Quite frankly, I don't _want_ people using Linux for ideological reasons.
I think ideology sucks. This world would be a much better place if people
had less ideology, and a whole lot more 'I do this because it's FUN and
because others might find it useful, not because I got religion'."
-- Linus Torvalds
diff -crN ../ion-devel-20030602-1/share/Makefile share/Makefile
*** ../ion-devel-20030602-1/share/Makefile Mon Jun 2 12:35:06 2003
--- share/Makefile Tue Jun 3 01:20:25 2003
***************
*** 17,22 ****
--- 17,24 ----
######################################
+ all: scripts
+
_install:
$(INSTALLDIR) $(SHAREDIR)
for i in $(SHELLSCRIPTS); do \
***************
*** 25,27 ****
--- 27,38 ----
for i in $(LUACODE); do \
$(INSTALL) -m $(DATA_MODE) $$i $(SHAREDIR); \
done
+
+ % : %.in
+ sed 's#SHAREDIR#$(SHAREDIR)#g;' $< > $@
+ chmod $(BIN_MODE) $@
+
+ scripts: $(SHELLSCRIPTS)
+
+ clean:
+ rm -f $(SHELLSCRIPTS)
diff -crN ../ion-devel-20030602-1/share/ion-edit share/ion-edit
*** ../ion-devel-20030602-1/share/ion-edit Fri May 30 23:17:53 2003
--- share/ion-edit Thu Jan 1 01:00:00 1970
***************
*** 1,2 ****
- #!/bin/sh
- exec run-mailcap --action=edit "$1" > /dev/null
--- 0 ----
diff -crN ../ion-devel-20030602-1/share/ion-edit.in share/ion-edit.in
*** ../ion-devel-20030602-1/share/ion-edit.in Thu Jan 1 01:00:00 1970
--- share/ion-edit.in Tue Jun 3 01:18:24 2003
***************
*** 0 ****
--- 1,2 ----
+ #!/bin/sh
+ exec run-mailcap --action=edit "$1" > /dev/null
diff -crN ../ion-devel-20030602-1/share/ion-man share/ion-man
*** ../ion-devel-20030602-1/share/ion-man Fri May 30 23:17:53 2003
--- share/ion-man Thu Jan 1 01:00:00 1970
***************
*** 1,4 ****
- #!/bin/sh
- topic=ion
- test $# -ge 1 && topic=$*
- exec ion-runinxterm -T "$topic manual" man $topic
--- 0 ----
diff -crN ../ion-devel-20030602-1/share/ion-man.in share/ion-man.in
*** ../ion-devel-20030602-1/share/ion-man.in Thu Jan 1 01:00:00 1970
--- share/ion-man.in Tue Jun 3 01:18:24 2003
***************
*** 0 ****
--- 1,4 ----
+ #!/bin/sh
+ topic=ion
+ test $# -ge 1 && topic=$*
+ exec SHAREDIR/ion-runinxterm -T "$topic manual" man $topic
diff -crN ../ion-devel-20030602-1/share/ion-runinxterm share/ion-runinxterm
*** ../ion-devel-20030602-1/share/ion-runinxterm Fri May 30 23:17:53 2003
--- share/ion-runinxterm Thu Jan 1 01:00:00 1970
***************
*** 1,30 ****
- #!/bin/sh
-
- test "$XTERMCMD" || XTERMCMD="xterm"
-
- if test $# -lt 1; then
- echo error
- exit 0
- fi
-
- if test "$1" = "--"; then
- shift
- eval "$@" || {
- echo "Press enter..."
- read nothing
- }
- exit
- fi
-
- if test "$1" = "-T"; then
- if test $# -lt 3; then
- echo error
- exit 0
- fi
- title="$2"
- shift 2
- else
- title="$1"
- fi
-
- exec $XTERMCMD -T "$title" -e $0 -- "$@"
--- 0 ----
diff -crN ../ion-devel-20030602-1/share/ion-runinxterm.in share/ion-runinxterm.in
*** ../ion-devel-20030602-1/share/ion-runinxterm.in Thu Jan 1 01:00:00 1970
--- share/ion-runinxterm.in Tue Jun 3 01:18:24 2003
***************
*** 0 ****
--- 1,30 ----
+ #!/bin/sh
+
+ test "$XTERMCMD" || XTERMCMD="xterm"
+
+ if test $# -lt 1; then
+ echo error
+ exit 0
+ fi
+
+ if test "$1" = "--"; then
+ shift
+ eval "$@" || {
+ echo "Press enter..."
+ read nothing
+ }
+ exit
+ fi
+
+ if test "$1" = "-T"; then
+ if test $# -lt 3; then
+ echo error
+ exit 0
+ fi
+ title="$2"
+ shift 2
+ else
+ title="$1"
+ fi
+
+ exec $XTERMCMD -T "$title" -e $0 -- "$@"
diff -crN ../ion-devel-20030602-1/share/ion-ssh share/ion-ssh
*** ../ion-devel-20030602-1/share/ion-ssh Fri May 30 23:17:53 2003
--- share/ion-ssh Thu Jan 1 01:00:00 1970
***************
*** 1,2 ****
- #!/bin/sh
- test $# -ge 1 && exec ion-runinxterm -T $1 ssh $1
--- 0 ----
diff -crN ../ion-devel-20030602-1/share/ion-ssh.in share/ion-ssh.in
*** ../ion-devel-20030602-1/share/ion-ssh.in Thu Jan 1 01:00:00 1970
--- share/ion-ssh.in Tue Jun 3 01:18:40 2003
***************
*** 0 ****
--- 1,2 ----
+ #!/bin/sh
+ test $# -ge 1 && exec SHAREDIR/ion-runinxterm -T $1 ssh $1
diff -crN ../ion-devel-20030602-1/share/ion-view share/ion-view
*** ../ion-devel-20030602-1/share/ion-view Fri May 30 23:17:53 2003
--- share/ion-view Thu Jan 1 01:00:00 1970
***************
*** 1,7 ****
- #!/bin/sh
- if echo "$1"|grep -E '^([a-zA-Z]+://|www.)' > /dev/null; then
- exec netscape-remote "$1"
- else
- exec run-mailcap --action=view "$1" > /dev/null
- fi
-
--- 0 ----
diff -crN ../ion-devel-20030602-1/share/ion-view.in share/ion-view.in
*** ../ion-devel-20030602-1/share/ion-view.in Thu Jan 1 01:00:00 1970
--- share/ion-view.in Tue Jun 3 01:18:24 2003
***************
*** 0 ****
--- 1,7 ----
+ #!/bin/sh
+ if echo "$1"|grep -E '^([a-zA-Z]+://|www.)' > /dev/null; then
+ exec netscape-remote "$1"
+ else
+ exec run-mailcap --action=view "$1" > /dev/null
+ fi
+
