Эх сурвалжийг харах

Make `run.sh` run in the right dir + better output

Jason Tarka 11 сар өмнө
parent
commit
88f6010203
1 өөрчлөгдсөн 8 нэмэгдсэн , 5 устгасан
  1. 8 5
      run.sh

+ 8 - 5
run.sh

@@ -11,6 +11,9 @@ NEW=new.tsv
 USAGE=usage.tsv
 TEMP=temp.tsv
 
+printf "\n=== $(date) ===\n"
+cd "$(dirname $0)" # Make sure local paths work.
+
 echo "Activating venv"
 source ./env/bin/activate
 
@@ -20,11 +23,11 @@ python3 main.py > ${NEW}
 echo "Retrieved $(wc -l ${NEW}) records"
 
 if [[ ! -f ${USAGE} ]]; then
-	echo "${USAGE} does not exist. Renaming $NEW to $USAGE."
+	echo "'${USAGE}' does not exist. Renaming '$NEW' to '$USAGE'."
 	mv ${NEW} ${USAGE}
 else
-	echo "${USAGE} exists, with $(cat ${USAGE} | wc -l) lines."
-	echo "Sorting & adding new records from ${NEW}."
+	echo "'${USAGE}' exists, with $(cat ${USAGE} | wc -l) lines."
+	echo "Sorting & adding new records from '${USAGE}' and '${NEW}' to '${TEMP}'."
 	header="$(head -n1 ${USAGE})"
 	echo "${header}" > ${TEMP}
 
@@ -33,9 +36,9 @@ else
 		>> ${TEMP}
 	
 	echo "$(wc -l ${TEMP})"
-	echo "Replacing ${USAGE} with contents of ${TEMP}"
+	echo "Replacing '${USAGE}' with contents of '${TEMP}'"
 	rm ${USAGE}
 	mv ${TEMP} ${USAGE}
 fi
 
-rm ${NEW}
+rm ${NEW} 2> /dev/null