GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00
Code Packages

Remove filter path logic from frontend script

Browse Source 
Now with relative path filtering in place, we can now give sub spawning
subshells in the frontend script.

Signed-off-by: Kai Krakow <kai@kaishome.de>
This commit is contained in:
Kai Krakow 2017-11-12 15:49:34 +01:00
parent 52997936d5
commit 0c6a4d00c8
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/beesd.conf.sample
View File

@ -16,7 +16,7 @@ UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
# BEESSTATUS="$WORK_DIR/$UUID.status" # BEESSTATUS="$WORK_DIR/$UUID.status"
## Make path shorter in logs ## Make path shorter in logs
# LOG_SHORT_PATH=N # OPTIONS="--relative-paths"
## Remove timestamp from bees output ## Remove timestamp from bees output
# LOG_FILTER_TIME=N # LOG_FILTER_TIME=N

11
scripts/beesd.in
View File

@ -64,7 +64,6 @@ MNT_DIR="${MNT_DIR:-$WORK_DIR/mnt/$UUID}"
BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}" BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}"
BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}" BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}"
DB_SIZE="${DB_SIZE:-$((64*AL16M))}" DB_SIZE="${DB_SIZE:-$((64*AL16M))}"
LOG_SHORT_PATH="${LOG_SHORT_PATH:-N}"
INFO "Check: Disk exists" INFO "Check: Disk exists"
if [ ! -b "/dev/disk/by-uuid/$UUID" ]; then if [ ! -b "/dev/disk/by-uuid/$UUID" ]; then
@ -116,14 +115,6 @@ fi
MNT_DIR="${MNT_DIR//\/\//\/}" MNT_DIR="${MNT_DIR//\/\//\/}"
filter_path(){ cd $MNT_DIR && @LIBEXEC_PREFIX@/bees ${ARGUMENTS[@]} $OPTIONS "$MNT_DIR" 3>&1 2>&1
if YN $LOG_SHORT_PATH; then
sed -e "s#$MNT_DIR##g"
else
cat
fi
}
@LIBEXEC_PREFIX@/bees ${ARGUMENTS[@]} $OPTIONS "$MNT_DIR" 3>&1 2>&1 | filter_path
exit 0 exit 0