Browse Source

Fix date request for admin log

Paolo Galli 4 years ago
parent
commit
d6131a6a20
1 changed files with 22 additions and 18 deletions
  1. 22 18
      lcmlog

+ 22 - 18
lcmlog

@@ -226,31 +226,34 @@ method_post()
 	fi
 
 	# Morning or afternoon shift
-	echo "Morning [m] or afternoon [p] shift?"
-	read CHAR
-	while [ -z $CHAR ]; do
-		echo "Retry, morning [m] or afternoon [p] shift?"
-		read CHAR
-	done
-	while [ $CHAR != "m" ] && [ $CHAR != "p" ]; do
-		echo "Retry, morning [m] or afternoon [p] shift?"
+	if [ $KIND == "150" ]; then
+		echo "Morning [m] or afternoon [p] shift?"
 		read CHAR
 		while [ -z $CHAR ]; do
 			echo "Retry, morning [m] or afternoon [p] shift?"
 			read CHAR
 		done
-	done
+		while [ $CHAR != "m" ] && [ $CHAR != "p" ]; do
+			echo "Retry, morning [m] or afternoon [p] shift?"
+			read CHAR
+			while [ -z $CHAR ]; do
+				echo "Retry, morning [m] or afternoon [p] shift?"
+				read CHAR
+			done
+		done
 
-	# Select the correct kind
-	if [ $CHAR == "m" ]; then
-		MP="mat"
-	elif [ $CHAR == "p" ]; then
-		MP="pom"
+		# Select the correct kind
+		if [ $CHAR == "m" ]; then
+			MP="mat"
+		elif [ $CHAR == "p" ]; then
+			MP="pom"
+		fi
+		
+		DATE=$YEAR"-"$MONTH"-"$DAY"_"$MP
+	else
+		DATE=$YEAR"-"$MONTH"-"$DAY
 	fi
 
-	# Finalization
-	DATE=$YEAR"-"$MONTH"-"$DAY"_"$MP
-
 
 	# TAGS
 	echo
@@ -352,8 +355,9 @@ Host server
 	#Port" \
 		> ~/.config/lcmlog/config
 		echo "Done. Now you should edit the file and add HostName (and eventually User and Port)."
+		echo "Opening file with $EDITOR in 4 seconds..."
 		sleep 4
-		nano ~/.config/lcmlog/config
+		$EDITOR ~/.config/lcmlog/config
 		echo
 	else
 		echo "Exit."