altosui: ensure that 'altosui' script is installed. Pass arguments along.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 984828238ab956fdf3662af71e239ca5c3da3229..dd4b31e64778c9ddb49e03da97eca941c70d9ed6 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -3,6 +3,8 @@ AM_JAVACFLAGS=-encoding UTF-8
 
 CLASSPATH_ENV=CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 
 CLASSPATH_ENV=CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 

+bin_SCRIPTS=altosui
+

 altosui_JAVA = \
        AltosChannelMenu.java \
        AltosConfig.java \
 altosui_JAVA = \
        AltosChannelMenu.java \
        AltosConfig.java \


@@ -129,12 +131,12 @@ Manifest-fat.txt:
 
 altosui: Makefile
        echo "#!/bin/sh" > $@
 
 altosui: Makefile
        echo "#!/bin/sh" > $@

-       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar"' >> $@
+       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@

        chmod +x $@
 
 altosui-test: Makefile
        echo "#!/bin/sh" > $@
        chmod +x $@
 
 altosui-test: Makefile
        echo "#!/bin/sh" > $@

-       echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar' >> $@
+       echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar "$$*"' >> $@

        chmod +x $@
 
 $(LIBALTOS):
        chmod +x $@
 
 $(LIBALTOS):

diff --git a/ao-tools/altosui/altosui-fat b/ao-tools/altosui/altosui-fat
index 9e5a8f15dde7902398726bb04c199972c5669603..95b1c051dd17796325b14c1e89b54ff2563bb41f 100755 (executable)
--- a/ao-tools/altosui/altosui-fat
+++ b/ao-tools/altosui/altosui-fat
@@ -1,4 +1,4 @@
 #!/bin/sh
 me=`which "$0"`
 dir=`dirname "$me"`
 #!/bin/sh
 me=`which "$0"`
 dir=`dirname "$me"`

-exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/altosui-fat.jar
+exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/altosui-fat.jar  "$@"