removed sudo from root script
This commit is contained in:
+58
-10
@@ -91,18 +91,18 @@ run_analysis() {
|
|||||||
if [ "${RECORDING_LENGTH}" == "01:00" ];then
|
if [ "${RECORDING_LENGTH}" == "01:00" ];then
|
||||||
until [ "$(ffmpeg -i ${1}/${i} 2>&1 | awk -F. '/Duration/ {print $1}' | cut -d':' -f3-4)" == "${RECORDING_LENGTH}" ];do
|
until [ "$(ffmpeg -i ${1}/${i} 2>&1 | awk -F. '/Duration/ {print $1}' | cut -d':' -f3-4)" == "${RECORDING_LENGTH}" ];do
|
||||||
sleep 1
|
sleep 1
|
||||||
[ $a -ge 60 ] && sudo rm -f ${1}/${i} && break
|
[ $a -ge 60 ] && sudo rm -f ${1}/${i} && break
|
||||||
a=$((a+1))
|
a=$((a+1))
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
until [ "$(ffmpeg -i ${1}/${i} 2>&1 | awk -F. '/Duration/ {print $1}' | cut -d':' -f3-4)" == "00:${RECORDING_LENGTH}" ];do
|
until [ "$(ffmpeg -i ${1}/${i} 2>&1 | awk -F. '/Duration/ {print $1}' | cut -d':' -f3-4)" == "00:${RECORDING_LENGTH}" ];do
|
||||||
sleep 1
|
sleep 1
|
||||||
[ $a -ge ${RECORDING_LENGTH} ] && sudo rm -f ${1}/${i} && break
|
[ $a -ge ${RECORDING_LENGTH} ] && sudo rm -f ${1}/${i} && break
|
||||||
a=$((a+1))
|
a=$((a+1))
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${1}/${i} ] && [ ! -f ${CUSTOM_LIST} ];then
|
if [ -f ${1}/${i} ] && [ ! -f ${CUSTOM_LIST} ] && [ -z $STATION_NUMBER ];then
|
||||||
echo "python3 analyze.py \
|
echo "python3 analyze.py \
|
||||||
--i "${1}/${i}" \
|
--i "${1}/${i}" \
|
||||||
--o "${1}/${i}.csv" \
|
--o "${1}/${i}.csv" \
|
||||||
@@ -119,9 +119,9 @@ run_analysis() {
|
|||||||
--lon "${LONGITUDE}" \
|
--lon "${LONGITUDE}" \
|
||||||
--week "${WEEK}" \
|
--week "${WEEK}" \
|
||||||
--overlap "${OVERLAP}" \
|
--overlap "${OVERLAP}" \
|
||||||
--sensitivity "${SENSITIVITY}" \
|
--sensitivity "${SENSITIVITY}" \
|
||||||
--min_conf "${CONFIDENCE}"
|
--min_conf "${CONFIDENCE}"
|
||||||
elif [ -f ${1}/${i} ] && [ -f ${CUSTOM_LIST} ];then
|
elif [ -f ${1}/${i} ] && [ -f ${CUSTOM_LIST} ] && [ -z $STATION_NUMBER ];then
|
||||||
echo "python3 analyze.py \
|
echo "python3 analyze.py \
|
||||||
--i "${1}/${i}" \
|
--i "${1}/${i}" \
|
||||||
--o "${1}/${i}.csv" \
|
--o "${1}/${i}.csv" \
|
||||||
@@ -139,10 +139,58 @@ run_analysis() {
|
|||||||
--lon "${LONGITUDE}" \
|
--lon "${LONGITUDE}" \
|
||||||
--week "${WEEK}" \
|
--week "${WEEK}" \
|
||||||
--overlap "${OVERLAP}" \
|
--overlap "${OVERLAP}" \
|
||||||
--sensitivity "${SENSITIVITY}" \
|
--sensitivity "${SENSITIVITY}" \
|
||||||
--min_conf "${CONFIDENCE}" \
|
--min_conf "${CONFIDENCE}" \
|
||||||
--custom_list "${CUSTOM_LIST}"
|
--custom_list "${CUSTOM_LIST}"
|
||||||
fi
|
elif [ -f ${1}/${i} ] && [ ! -f ${CUSTOM_LIST} ] && [ ! -z $STATION_NUMBER ];then
|
||||||
|
echo "python3 analyze.py \
|
||||||
|
--i "${1}/${i}" \
|
||||||
|
--o "${1}/${i}.csv" \
|
||||||
|
--lat "${LATITUDE}" \
|
||||||
|
--lon "${LONGITUDE}" \
|
||||||
|
--week "${WEEK}" \
|
||||||
|
--overlap "${OVERLAP}" \
|
||||||
|
--sensitivity "${SENSITIVITY}" \
|
||||||
|
--min_conf "${CONFIDENCE}" \
|
||||||
|
--s "${STATION_NUMBER}"\
|
||||||
|
--meta_data "${STATION_NAME}""
|
||||||
|
"${VENV}"/bin/python analyze.py \
|
||||||
|
--i "${1}/${i}" \
|
||||||
|
--o "${1}/${i}.csv" \
|
||||||
|
--lat "${LATITUDE}" \
|
||||||
|
--lon "${LONGITUDE}" \
|
||||||
|
--week "${WEEK}" \
|
||||||
|
--overlap "${OVERLAP}" \
|
||||||
|
--sensitivity "${SENSITIVITY}" \
|
||||||
|
--min_conf "${CONFIDENCE}" \
|
||||||
|
--s "${STATION_NUMBER}"\
|
||||||
|
--meta_data "${STATION_NAME}"
|
||||||
|
elif [ -f ${1}/${i} ] && [ -f ${CUSTOM_LIST} ] && [ ! -z $STATION_NUMBER ];then
|
||||||
|
echo "python3 analyze.py \
|
||||||
|
--i "${1}/${i}" \
|
||||||
|
--o "${1}/${i}.csv" \
|
||||||
|
--lat "${LATITUDE}" \
|
||||||
|
--lon "${LONGITUDE}" \
|
||||||
|
--week "${WEEK}" \
|
||||||
|
--overlap "${OVERLAP}" \
|
||||||
|
--sensitivity "${SENSITIVITY}" \
|
||||||
|
--min_conf "${CONFIDENCE}" \
|
||||||
|
--custom_list "${CUSTOM_LIST}"\
|
||||||
|
--s "${STATION_NUMBER}"\
|
||||||
|
--meta_data "${STATION_NAME}""
|
||||||
|
"${VENV}"/bin/python analyze.py \
|
||||||
|
--i "${1}/${i}" \
|
||||||
|
--o "${1}/${i}.csv" \
|
||||||
|
--lat "${LATITUDE}" \
|
||||||
|
--lon "${LONGITUDE}" \
|
||||||
|
--week "${WEEK}" \
|
||||||
|
--overlap "${OVERLAP}" \
|
||||||
|
--sensitivity "${SENSITIVITY}" \
|
||||||
|
--min_conf "${CONFIDENCE}" \
|
||||||
|
--custom_list "${CUSTOM_LIST}"\
|
||||||
|
--s "${STATION_NUMBER}"\
|
||||||
|
--meta_data "${STATION_NAME}"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ ExecStart=/usr/local/bin/daily_plot.py
|
|||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
EOF
|
EOF
|
||||||
sudo systemctl enable chart_viewer.service
|
systemctl enable chart_viewer.service
|
||||||
}
|
}
|
||||||
|
|
||||||
install_gotty_logs() {
|
install_gotty_logs() {
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ ExecStart=/usr/local/bin/daily_plot.py
|
|||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
EOF
|
EOF
|
||||||
sudo systemctl enable chart_viewer.service
|
systemctl enable chart_viewer.service
|
||||||
}
|
}
|
||||||
|
|
||||||
install_gotty_logs() {
|
install_gotty_logs() {
|
||||||
|
|||||||
Reference in New Issue
Block a user