This commit is contained in:
Justin (shocknet) 2024-07-05 23:50:39 -04:00
parent 671b5f1f9c
commit 6c30914057

View file

@ -17,19 +17,19 @@ get_log_info() {
ls -1t ${LOG_DIR}/components/nostrMiddleware_*.log 2>/dev/null | head -n 1 ls -1t ${LOG_DIR}/components/nostrMiddleware_*.log 2>/dev/null | head -n 1
} }
TIMEOUT=30 TIMEOUT=180
while ! grep -q "rimraf build" <(tail -n 0 -F ${LOG_DIR}/components/nostrMiddleware_*.log) && [ $TIMEOUT -gt 0 ]; do while [ ! -f ${LOG_DIR}/components/unlocker_*.log ] && [ $TIMEOUT -gt 0 ]; do
sleep 1 echo "Waiting for build..."
TIMEOUT=$((TIMEOUT - 1)) sleep 10
TIMEOUT=$((TIMEOUT - 10))
done done
if [ $TIMEOUT -le 0 ]; then if [ $TIMEOUT -le 0 ]; then
echo "Timeout waiting for 'rimraf build' message." echo "Timeout waiting for unlocker log file."
exit 1 exit 1
fi fi
echo "Running build..."
TIMEOUT=45 TIMEOUT=45
while ! grep -q -e "unlocker >> macaroon not found, creating wallet..." -e "unlocker >> the wallet is already unlocked" -e "unlocker >> wallet is locked, unlocking" <(tail -n 0 -F ${LOG_DIR}/components/nostrMiddleware_*.log) && [ $TIMEOUT -gt 0 ]; do while ! grep -q -e "unlocker >> macaroon not found, creating wallet..." -e "unlocker >> the wallet is already unlocked" -e "unlocker >> wallet is locked, unlocking" <(tail -n 0 -F ${LOG_DIR}/components/unlocker_*.log) && [ $TIMEOUT -gt 0 ]; do
sleep 1 sleep 1
TIMEOUT=$((TIMEOUT - 1)) TIMEOUT=$((TIMEOUT - 1))
done done
@ -38,9 +38,9 @@ get_log_info() {
exit 1 exit 1
fi fi
if grep -q "unlocker >> macaroon not found, creating wallet..." <(tail -n 0 -F ${LOG_DIR}/components/nostrMiddleware_*.log); then if grep -q "unlocker >> macaroon not found, creating wallet..." <(tail -n 0 -F ${LOG_DIR}/components/unlocker_*.log); then
echo "Creating wallet..." echo "Creating wallet..."
elif grep -q "unlocker >> wallet is locked, unlocking" <(tail -n 0 -F ${LOG_DIR}/components/nostrMiddleware_*.log); then elif grep -q "unlocker >> wallet is locked, unlocking" <(tail -n 0 -F ${LOG_DIR}/components/unlocker_*.log); then
echo "Unlocking wallet..." echo "Unlocking wallet..."
else else
echo "Wallet is already unlocked." echo "Wallet is already unlocked."