forked from github/server
remove luarocks from scripts
This commit is contained in:
parent
26bb5d4f07
commit
56896361fb
1
s/build
1
s/build
|
@ -1,6 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
ROOT=$(git rev-parse --show-toplevel)
|
ROOT=$(git rev-parse --show-toplevel)
|
||||||
eval $(luarocks path)
|
|
||||||
[ -z "$BUILD" ] && BUILD=Debug
|
[ -z "$BUILD" ] && BUILD=Debug
|
||||||
if [ -z "$JOBS" ] ; then
|
if [ -z "$JOBS" ] ; then
|
||||||
if [ -e /usr/sbin/sysctl ]; then
|
if [ -e /usr/sbin/sysctl ]; then
|
||||||
|
|
|
@ -6,9 +6,6 @@ pkg-config --exists sqlite3 && ERESSEA_DB=sqlite
|
||||||
GETOPT=getopt
|
GETOPT=getopt
|
||||||
GETOPT_LONG=1
|
GETOPT_LONG=1
|
||||||
|
|
||||||
if [ -z "$(luarocks show lunitx)" ] ; then
|
|
||||||
luarocks install lunitx --local
|
|
||||||
fi
|
|
||||||
if [ "Darwin" = "$(uname)" ] ; then
|
if [ "Darwin" = "$(uname)" ] ; then
|
||||||
if [ -x "/usr/local/opt/gnu-getopt/bin/getopt" ] ; then
|
if [ -x "/usr/local/opt/gnu-getopt/bin/getopt" ] ; then
|
||||||
GETOPT="/usr/local/opt/gnu-getopt/bin/getopt"
|
GETOPT="/usr/local/opt/gnu-getopt/bin/getopt"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
eval $(luarocks path)
|
|
||||||
ROOT=$(git rev-parse --show-toplevel)
|
ROOT=$(git rev-parse --show-toplevel)
|
||||||
export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH"
|
export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH"
|
||||||
[ -z $BUILD ] && BUILD=Debug ; export BUILD
|
[ -z $BUILD ] && BUILD=Debug ; export BUILD
|
||||||
|
|
Loading…
Reference in New Issue