Merge branch 'recursividad' into 'antifascista'
Poder correr haini.sh recursivamente See merge request sutty/haini.sh!27
This commit is contained in:
commit
3c0f04cf3b
1 changed files with 8 additions and 4 deletions
8
haini.sh
8
haini.sh
|
@ -15,7 +15,7 @@ if test "$ROOT" != "$(dirname "$PWD")" && test "$ROOT" != "$PWD"; then
|
|||
fi
|
||||
|
||||
# Necesitamos bubblewrap
|
||||
if ! type bwrap >/dev/null 2>&1 ; then
|
||||
if ! test "$HAIN_ENV" && ! type bwrap >/dev/null 2>&1 ; then
|
||||
echo "Por favor, instala el paquete bubblewrap"
|
||||
exit 1
|
||||
fi
|
||||
|
@ -190,11 +190,15 @@ case $1 in
|
|||
init) echo "export PATH=$DIR:\$PATH" ; exit ;;
|
||||
serve) shift; DEFAULT=nginx ;;
|
||||
*)
|
||||
if ! type "$SELF" >/dev/null 2>&1 ; then
|
||||
if ! test "$HAIN_ENV" && ! type "$SELF" >/dev/null 2>&1 ; then
|
||||
echo "Tip: Inicia haini.sh con 'eval \$($0 init)' para poder ejecutar con solo 'haini.sh'" >&2
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test $HAIN_ENV; then
|
||||
${*:-$DEFAULT}
|
||||
else
|
||||
crear_entorno
|
||||
stdin=/dev/stdin correr "${*:-$DEFAULT}"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue