GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-06-15 09:16:34 +02:00
Code Packages Activity

Merge remote-tracking branches 'kakra/feature/add-relative-path-option' and 'kakra/integration'

Browse Source
This commit is contained in:
Zygo Blaxell
2018-01-07 21:39:01 -05:00
parent 9d295fab4e 3024e43355 270a91cf17
commit ba981c133a
5 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/beesd.conf.sample
View File

@ -15,11 +15,8 @@ UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
# BEESHOME="$MNT_DIR/.beeshome"
# BEESSTATUS="$WORK_DIR/$UUID.status"
## Make path shorter in logs
# LOG_SHORT_PATH=N
## Remove timestamp from bees output
# LOG_FILTER_TIME=N
## Default options to apply, see --help for details
# OPTIONS="--relative-paths --notimestamps"
## Bees DB size
# Hash Table Sizing

13
scripts/beesd.in
View File

@ -64,7 +64,6 @@ MNT_DIR="${MNT_DIR:-$WORK_DIR/mnt/$UUID}"
BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}"
BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}"
DB_SIZE="${DB_SIZE:-$((64*AL16M))}"
LOG_SHORT_PATH="${LOG_SHORT_PATH:-N}"
INFO "Check: Disk exists"
if [ ! -b "/dev/disk/by-uuid/$UUID" ]; then
@ -116,14 +115,4 @@ fi
MNT_DIR="${MNT_DIR//\/\//\/}"
filter_path(){
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
cd $MNT_DIR && exec @LIBEXEC_PREFIX@/bees ${ARGUMENTS[@]} $OPTIONS "$MNT_DIR"