Mercurial Hosting > luan
changeset 1970:750a1d74d3c1 default tip
better build
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Thu, 12 Jun 2025 11:27:48 -0600 |
| parents | c7585a196f32 |
| children | |
| files | scripts/build-luan.sh scripts/install.sh scripts/luan.sh scripts/uninstall.sh |
| diffstat | 4 files changed, 24 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/build-luan.sh Tue Jun 10 20:46:25 2025 -0600 +++ b/scripts/build-luan.sh Thu Jun 12 11:27:48 2025 -0600 @@ -1,9 +1,8 @@ #!/bin/bash - set -e -cd `dirname $0`/.. -LUANHOME=`pwd` +cd "$(dirname $0)/.." +LUANHOME="$(pwd)" rm -rf build mkdir -p build/luan/jars @@ -13,22 +12,22 @@ . $LUANHOME/classpath.sh -cd $LUANHOME/src -javac -classpath $CLASSPATH `find . -name *.java` -jar cvf $LUANHOME/build/luan/jars/luan.jar `find . -name *.class -o -name *.luan` +cd "$LUANHOME/src" +javac -classpath "$CLASSPATH" $(find . -name *.java) +jar cvf "$LUANHOME/build/luan/jars/luan.jar" $(find . -name *.class -o -name *.luan) cd $LUANHOME/slf4j/src -javac -classpath $CLASSPATH `find . -name *.java` -jar cvf $LUANHOME/build/luan/jars/slf4j-goodjava.jar `find . -name *.class -o -name *.luan` +javac -classpath "$CLASSPATH" $(find . -name *.java) +jar cvf "$LUANHOME/build/luan/jars/slf4j-goodjava.jar" $(find . -name *.class -o -name *.luan) -cd $LUANHOME +cd "$LUANHOME" +cp scripts/luan.sh build/luan cp scripts/install.sh build/luan -#chmod +x build/luan/install.sh cp scripts/uninstall.sh build/luan hg identify >build/luan/hg_rev.txt cd build -tar -cf $LUANHOME/website/src/download/luan.tar luan +tar -cf "$LUANHOME/website/src/download/luan.tar" luan luan/install.sh || sudo luan/install.sh
--- a/scripts/install.sh Tue Jun 10 20:46:25 2025 -0600 +++ b/scripts/install.sh Thu Jun 12 11:27:48 2025 -0600 @@ -1,20 +1,14 @@ #!/bin/bash - set -e -cd `dirname $0` +cd "$(dirname $0)" mkdir -p /usr/local/bin cat >/usr/local/bin/luan <<End #!/bin/bash -LUAN=$(pwd) - -for i in \$LUAN/jars/* ; do CLASSPATH=\$CLASSPATH:\$i ; done -CLASSPATH=\$(echo -n \$CLASSPATH | sed 's/^://') - -java -classpath \$CLASSPATH luan.Luan "\$@" +"$(pwd)/luan.sh" "\$@" End chmod +x /usr/local/bin/luan
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/luan.sh Thu Jun 12 11:27:48 2025 -0600 @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +LUAN="$(dirname $0)" + +for i in $LUAN/jars/* ; do CLASSPATH=$CLASSPATH:$i ; done +CLASSPATH=$(echo -n $CLASSPATH | sed 's/^://') + +java -classpath "$CLASSPATH" luan.Luan "$@"
--- a/scripts/uninstall.sh Tue Jun 10 20:46:25 2025 -0600 +++ b/scripts/uninstall.sh Thu Jun 12 11:27:48 2025 -0600 @@ -1,7 +1,7 @@ #!/bin/bash +set -e -set -e rm -f /usr/local/bin/luan -cd `dirname $0` +cd "$(dirname $0)" echo "luan has been uninstalled" -echo "you can now delete `pwd`" +echo "you can now delete $(pwd)"