Merge pull request hestiacp#742 from mzf/master

serghey-rodin · web-flow · commit 4ad29ac76c9b · 2016-07-06T13:56:27.000+03:00
Fix hanging processes when generate api-key
diff --git a/bin/v-generate-api-key b/bin/v-generate-api-key
@@ -11,7 +11,7 @@
 
 keygen()
 {
-    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1
+    < /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo;
 }
 KEYS='/usr/local/vesta/data/keys/'
 HASH=$(keygen)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`keygen()`
`13`	`13`	`{`
`14`		`- cat /dev/urandom \| tr -dc 'a-zA-Z0-9' \| fold -w ${1:-32} \| head -n 1`
	`14`	`+ < /dev/urandom tr -dc _A-Z-a-z-0-9 \| head -c${1:-32};echo;`
`15`	`15`	`}`
`16`	`16`	`KEYS='/usr/local/vesta/data/keys/'`
`17`	`17`	`HASH=$(keygen)`