Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

begin moving functions to common.sh (top htop) #776

Merged
merged 48 commits into from
Dec 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
e4fb6e3
begin moving functions to common.sh
tschettervictor Dec 16, 2024
e448707
rename to be consistent
tschettervictor Dec 16, 2024
5bc7cd8
begin function define in top
tschettervictor Dec 16, 2024
e0dfc33
move jail running check to for loop
tschettervictor Dec 16, 2024
0e3f7a5
rename function to target
tschettervictor Dec 16, 2024
6331467
htop function add
tschettervictor Dec 16, 2024
3c92733
Update top.sh
tschettervictor Dec 16, 2024
dc55881
source config from common.sh
tschettervictor Dec 16, 2024
538ec81
move top and htop to no action command
tschettervictor Dec 16, 2024
fe029c0
exit if no args
tschettervictor Dec 16, 2024
d2943bd
exit if no args
tschettervictor Dec 16, 2024
6d2e9c2
also source config file
tschettervictor Dec 16, 2024
1fce192
spacing
tschettervictor Dec 16, 2024
3aeb17c
Merge branch 'BastilleBSD:master' into check_jail_exists-function
tschettervictor Dec 17, 2024
31cc087
Add set_target function
tschettervictor Dec 17, 2024
0ddd4d9
Fox vars
tschettervictor Dec 17, 2024
0874e02
Update common.sh
tschettervictor Dec 17, 2024
42a6a29
only accept one target for top
tschettervictor Dec 17, 2024
9e8cd7b
accept only one arg on htop
tschettervictor Dec 17, 2024
b225320
accept only one arg with htop
tschettervictor Dec 17, 2024
bff6b93
Update top.sh
tschettervictor Dec 17, 2024
1bcd44c
add set_target_single function to only allow single jail targetting
tschettervictor Dec 17, 2024
ac30b36
only set target with set_target_single
tschettervictor Dec 17, 2024
1b23c04
Update top.sh
tschettervictor Dec 17, 2024
f86ad1f
Update htop.sh
tschettervictor Dec 17, 2024
0d9a793
Update top.sh
tschettervictor Dec 17, 2024
4248ea9
Update common.sh
tschettervictor Dec 17, 2024
4276e63
Update htop.sh
tschettervictor Dec 17, 2024
9da73d6
set TARGET to local only for some functions
tschettervictor Dec 17, 2024
52c8d8e
Merge branch 'BastilleBSD:master' into check_jail_exists-function
tschettervictor Dec 17, 2024
cbcd388
organize functions in alphabetical order
tschettervictor Dec 19, 2024
76e6113
error handling
tschettervictor Dec 19, 2024
5b68630
remove 0
tschettervictor Dec 19, 2024
200321c
error handling
tschettervictor Dec 19, 2024
d458ed8
Update common.sh
tschettervictor Dec 21, 2024
4a93f61
Update htop.sh
tschettervictor Dec 21, 2024
5913fcc
Update top.sh
tschettervictor Dec 21, 2024
0413a94
spacing
tschettervictor Dec 22, 2024
d293db2
move help into options block
tschettervictor Dec 24, 2024
54bf9d6
move help into options block
tschettervictor Dec 24, 2024
db0f5c5
minor tweak
tschettervictor Dec 27, 2024
82a8d54
minor tweak
tschettervictor Dec 27, 2024
9b354c1
minor tweak
tschettervictor Dec 27, 2024
2bd0680
Merge branch 'master' into check_jail_exists-function
tschettervictor Dec 27, 2024
3c04a88
Merge branch 'BastilleBSD:master' into check_jail_exists-function
tschettervictor Dec 27, 2024
7a621b2
Merge branch 'master' into check_jail_exists-function
tschettervictor Dec 31, 2024
4bc76d5
fix brace
tschettervictor Dec 31, 2024
fedc7aa
Remove message on return 1
tschettervictor Dec 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move jail running check to for loop
tschettervictor authored Dec 16, 2024
commit e0dfc33e4611705d8144b3419ec6f06467372b51
4 changes: 2 additions & 2 deletions usr/local/share/bastille/top.sh
Original file line number Diff line number Diff line change
@@ -47,8 +47,7 @@ shift
if [ "${TARGET}" = "ALL" ]; then
target_all_jails
else
check_jail_exists "${TARGET}"
check_target_is_running "${TARGET}"
check_target_exists "${TARGET}"
fi

if [ $# -ne 0 ]; then
@@ -58,6 +57,7 @@ fi
bastille_root_check

for _jail in ${JAILS}; do
check_target_is_running "${TARGET}"
info "[${_jail}]:"
jexec -l "${_jail}" /usr/bin/top
echo -e "${COLOR_RESET}"