mirror of
https://github.com/linux-odyssey/linux-odyssey.git
synced 2026-11-07 19:10:12 +08:00
feat: change to use Zsh
* show message from server response * send output and error to server
This commit is contained in:
1 parent
0153eae673
commit
6204bd0b17
10 files changed
+96
-104
No files matched your search
@@ -3,9 +3,10 @@ FROM node:latest
|
||||
RUN apt-get update && apt-get install -y \
|
||||
curl \
|
||||
vim \
|
||||
zsh \
|
||||
jq
|
||||
|
||||
RUN adduser --disabled-password --gecos '' rudeus
|
||||
RUN adduser --disabled-password --gecos '' --shell /bin/zsh rudeus
|
||||
|
||||
USER rudeus
|
||||
|
||||
@@ -15,4 +16,4 @@ COPY ./server/quests/helloworld/home /home/rudeus/
|
||||
|
||||
COPY ./packages/cli/cli.js /usr/local/bin/cli.js
|
||||
|
||||
CMD [ "/bin/bash" ]
|
||||
CMD [ "/bin/zsh" ]
|
||||
@@ -1,24 +0,0 @@
|
||||
# This function will be called before each command is executed
|
||||
preexec() {
|
||||
[ -n "$COMP_LINE" ] && return # do nothing if completing
|
||||
[ "$BASH_COMMAND" = "$PROMPT_COMMAND" ] && return # do nothing if completing
|
||||
export COMMAND="$BASH_COMMAND"
|
||||
|
||||
if [[ $COMMAND =~ ^(vim|top|less|more|nano) ]]; then
|
||||
node /usr/local/bin/cli.js
|
||||
return
|
||||
fi
|
||||
|
||||
# Execute the command, capture output and exit code
|
||||
export OUTPUT=$( { eval $COMMAND 2>&1; echo $? > /tmp/exit_code; })
|
||||
export EXIT_CODE=$(cat /tmp/exit_code)
|
||||
|
||||
echo $OUTPUT
|
||||
# Send command to the API
|
||||
node /usr/local/bin/cli.js
|
||||
|
||||
BASH_COMMAND=""
|
||||
}
|
||||
|
||||
# Install the trap
|
||||
trap 'preexec' DEBUG
|
||||
@@ -0,0 +1,36 @@
|
||||
PROMPT='%n@%m:%~%# '
|
||||
unsetopt CASE_GLOB
|
||||
setopt CHASE_LINKS
|
||||
emulate bash
|
||||
|
||||
typeset -A cmd
|
||||
|
||||
preexec() {
|
||||
export CMD_START_TIME=$(date +%s%N) # capture start time
|
||||
export CMD_NAME=$1 # capture command
|
||||
|
||||
# A list of interactive commands
|
||||
interactive_commands=("vim" "nano" "top" "ssh" "less" "zsh" "bash")
|
||||
|
||||
# Check if the command is in the list of interactive commands
|
||||
if [[ " ${interactive_commands[@]} " =~ " $1 " ]]; then
|
||||
# If it is, just execute it normally
|
||||
eval $1
|
||||
else
|
||||
# If it's not, execute it and redirect its output to a file
|
||||
eval $1 > /tmp/cmd.out 2>/tmp/cmd.error
|
||||
fi
|
||||
}
|
||||
|
||||
precmd() {
|
||||
export CMD_END_TIME=$(date +%s%N) # capture end time
|
||||
export CMD_EXIT_CODE=$? # capture exit status
|
||||
export CMD_OUTPUT_FILE=/tmp/cmd.out # read command output from file
|
||||
export CMD_ERROR_FILE=/tmp/cmd.error
|
||||
|
||||
# Now run your Node.js script with the result as an argument
|
||||
node /usr/local/bin/cli.js
|
||||
|
||||
rm /tmp/cmd.out /tmp/cmd.error 2>/dev/null # cleanup
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user