Merge branch 'develop' of https://github.com/FunKey-Project/FunKey-OS into develop

This commit is contained in:
Vincent-FK 2021-01-05 23:44:19 +01:00
commit 4243dd85b6
2 changed files with 22 additions and 15 deletions

View File

@ -20,12 +20,8 @@ touch "${LOCK_FILE}"
# Increment name and save snapshot
SNAPSHOT_DIR=/mnt/funkey/snapshots
mkdir -p "${SNAPSHOT_DIR}"
last=$(cd ${SNAPSHOT_DIR}; ls IMG_*.PNG 2> /dev/null | tail -1 | sed 's/^IMG_\([0-9]\+\)\.PNG$/\1/')
if [ "x${last}" = "x" ]; then
last=1
else
last=$(expr $last + 1)
fi
last=$(cd ${SNAPSHOT_DIR}; ls IMG_*.PNG 2> /dev/null | tail -1 | sed 's/^IMG_0*\([0-9]\+\)\.PNG$/\1/')
let last=${last}+1
snapshot_file=$(printf "IMG_%04d.PNG" $last)
notif_set 2 " NEW SCREEENSHOT ${snapshot_file}"
fbgrab "${SNAPSHOT_DIR}/${snapshot_file}" &

View File

@ -1,6 +1,7 @@
#!/bin/sh
SNAPSHOT_DIR=/mnt/funkey/snapshots
# Uncomment the following line to get debug info
#set -x
# Check args
if [ ${#} -ne 0 ]; then
@ -8,14 +9,24 @@ if [ ${#} -ne 0 ]; then
exit 1
fi
mkdir -p "${SNAPSHOT_DIR}"
last=$(cd ${SNAPSHOT_DIR}; ls IMG_*.PNG 2> /dev/null | tail -1 | sed 's/^IMG_\([0-9]\+\)\.PNG$/\1/')
if [ "x${last}" = "x" ]; then
last=1
else
let last++
# Lock file (necessary since fbgrab must run in bg not to block the buttons while gaming)
LOCK_FILE="/var/lock/snap.lock"
if [ -f "${LOCK_FILE}" ]; then
#echo "${LOCK_FILE} already exists"
exit 1
fi
touch "${LOCK_FILE}"
# Increment name and save snapshot
SNAPSHOT_DIR=/mnt/funkey/snapshots
mkdir -p "${SNAPSHOT_DIR}"
last=$(cd ${SNAPSHOT_DIR}; ls IMG_*.PNG 2> /dev/null | tail -1 | sed 's/^IMG_0*\([0-9]\+\)\.PNG$/\1/')
let last=${last}+1
snapshot_file=$(printf "IMG_%04d.PNG" $last)
fbgrab "${SNAPSHOT_DIR}/${snapshot_file}"
notif_disp 1 " CAPTURE TO ${snapshot_file}"
notif_set 2 " NEW SCREEENSHOT ${snapshot_file}"
fbgrab "${SNAPSHOT_DIR}/${snapshot_file}" &
# Remove lock file
rm -f "${LOCK_FILE}"
exit 0