error messages

CHANGELOG.md

@@ -14,6 +14,9 @@
 * **Traps**
 	- traps are more strict (less chance for data corruption if interrupted during operation)
 
+* **Error**
+	- error messages are more helpful
+
 
 # v1.3
 ## Updates

monero-bash

@@ -135,7 +135,7 @@ if [[ $options = "true" ]]; then
 				daemon|monerod|monero) define_Monero;systemd_Edit ;;
 				xmrig|xmr) define_XMRig;systemd_Edit ;;
 				p2pool|p2p) define_P2Pool;systemd_Edit ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <daemon/p2pool/xmrig>" ;;
 			esac
 			;;
 		reset)
@@ -144,7 +144,7 @@ if [[ $options = "true" ]]; then
 				*"bash"*|*"Bash"*|*"BASH"*)define_MoneroBash;reset_Template ;;
 				xmrig|xmr) define_XMRig;reset_Template ;;
 				p2pool|p2p) define_P2Pool;reset_Template ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <bash/daemon/p2pool/xmrig>" ;;
 			esac
 			;;
 		start)
@@ -153,8 +153,7 @@ if [[ $options = "true" ]]; then
 				xmrig|xmr) define_XMRig;process_Start ;;
 				p2pool|p2p) define_P2Pool;process_Start ;;
 				all) mine_Start ;;
-				"") print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
 			esac
 			;;
 		stop)
@@ -163,8 +162,7 @@ if [[ $options = "true" ]]; then
 				xmrig|xmr) define_XMRig;process_Stop ;;
 				p2pool|p2p) define_P2Pool;process_Stop ;;
 				all) mine_Stop ;;
-				"") print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
 			esac
 			;;
 		restart)
@@ -173,8 +171,7 @@ if [[ $options = "true" ]]; then
 				xmrig|xmr) define_XMRig;process_Restart ;;
 				p2pool|p2p) define_P2Pool;process_Restart ;;
 				all) mine_Restart ;;
-				"") print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
 			esac
 			;;
 		kill)
@@ -183,26 +180,23 @@ if [[ $options = "true" ]]; then
 				xmrig|xmr) define_XMRig;process_Kill ;;
 				p2pool|p2p) define_P2Pool;process_Kill ;;
 				all) mine_Kill ;;
-				"") print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <all/daemon/p2pool/xmrig>" ;;
 			esac
 			;;
 		full)
 			case $2 in
 				daemon|monerod|monero) define_Monero;process_Full ;;
 				xmrig|xmr) define_XMRig;process_Full ;;
 				p2pool|p2p) define_P2Pool;process_Full ;;
-				"") print_Error "Pick: <daemon/xmrig/p2pool>" ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <daemon/xmrig/p2pool>" ;;
 			esac
 			;;
 		watch)
 			case $2 in
 				daemon|monerod|monero) watch_Monero ;;
 				xmrig|xmr) watch_XMRig ;;
 				p2pool|p2p) watch_P2Pool ;;
-				"") print_Error "Pick: <daemon/xmrig/p2pool>" ;;
-				*) error_Unknown ;;
+				*) print_Error "Pick: <daemon/xmrig/p2pool>" ;;
 			esac
 			;;
 		gpg)
@@ -212,13 +206,13 @@ if [[ $options = "true" ]]; then
 					case $3 in
 						all|All|ALL) gpg_import_All ;;
 						binaryfate|Binaryfate|monero|Monero|MONERO) gpg_import_Monero ;;
-						hinto|hinto-janaiyo|Hinto|monero-bash|Monero-Bash) gpg_import_MoneroBash ;;
+						hinto|hinto-janaiyo|Hinto|*"bash"*|*"Bash"*|*"BASH"*) gpg_import_MoneroBash ;;
 						xmrig|XMRig|XMRIG|Xmrig) gpg_import_XMRig ;;
 						SChernykh|schernykh|SCHERNYKH|p2pool|p2p|P2P|P2Pool|P2POOL) gpg_import_P2Pool ;;
-						*) error_Unknown ;;
+						*) print_Error "Pick: <monero/bash/xmrig/p2pool>" ;;
 					esac
 					;;
-				*) error_Unknown ;;
+				*) print_Error "Did you mean <gpg import> ?" ;;
 			esac
 			;;
 		upgrade)
@@ -271,7 +265,7 @@ if [[ $options = "true" ]]; then
 			case $2 in
 				*"bash"*|*"Bash"*|*"BASH"*)
 					$bwhite; echo -n "Install [monero-bash]? (Y/n) " ;$off
-					Yes(){ echo "uhh... It's already installed..." ;}
+					Yes(){ echo "Umm... It's already installed..." ;}
 					No(){ echo "Exiting..." ;exit;}
 					prompt_YESno
 					;;

src/txt/hashlist

@@ -1,4 +1,4 @@
-1251095bd3edd55ad8853c660d229bbd9e343ebd8cc4eccd470356a2eb2f27ea  monero-bash
+0c80c846bb54a1ae3c2ebae5e02b0b91bcf7862faa9bb4b3f51446d41c570270  monero-bash
 963c01218a8086475c760430dfa539d923619fac07513e74caa657c6dad10439  src/debug
 56da6eaf9ccf77a9ffef22f1c969d95ee16e354f3710c9bcc8062adfd3303e0b  src/source
 78537dcbabd068da59044d2b346ec87c1ecf79b84cf39bee915c76b8f6c5261c  src/var