Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-24 03:01:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jose
2019-12-19 11:20:47 -04:00
parent 1b522522af eb13d48eac
commit 61f49e5d02
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -364,7 +364,7 @@ ishmael ~ # bastille list
You can also list non-running containers with `bastille list containers`. In You can also list non-running containers with `bastille list containers`. In
the same manner you can list archived `logs`, downloaded `templates`, and the same manner you can list archived `logs`, downloaded `templates`, and
`releases`. `releases`. Providing the `-j` flag to list alone will result in JSON output.
bastille service bastille service

7
usr/local/share/bastille/list.sh
View File

@@ -32,7 +32,7 @@
. /usr/local/etc/bastille/bastille.conf . /usr/local/etc/bastille/bastille.conf
usage() { usage() {
echo -e "${COLOR_RED}Usage: bastille list [release|template|(jail|container)|log].${COLOR_RESET}" echo -e "${COLOR_RED}Usage: bastille list [-j] [release|template|(jail|container)|log].${COLOR_RESET}"
exit 1 exit 1
} }
@@ -40,6 +40,11 @@ if [ $# -eq 0 ]; then
jls -N jls -N
fi fi
if [ "$1" == "-j" ]; then
jls -N --libxo json
exit 0
fi
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
# Handle special-case commands first. # Handle special-case commands first.
case "$1" in case "$1" in