From 74e973b7327bc7e7bdd8a9d8aafd88051dc5fd8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 12 Oct 2017 20:04:48 +0200
Subject: Update some configurations

---
 local/bin/usbkey | 4 ++--
 shellrc          | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/local/bin/usbkey b/local/bin/usbkey
index bab47df..7e89dea 100755
--- a/local/bin/usbkey
+++ b/local/bin/usbkey
@@ -153,7 +153,7 @@ op_openvpn_get() {
 	fi
 	mkdir "openvpn-$NAME"
 	cp "$MOUNT_PATH/openvpn/$NAME.key" "openvpn-$NAME/"
-	cp "$MOUNT_PATH/openvpn/$NAME.crl" "openvpn-$NAME/"
+	cp "$MOUNT_PATH/openvpn/$NAME.crt" "openvpn-$NAME/"
 	cp "$MOUNT_PATH/openvpn/ca.crt" "openvpn-$NAME/"
 	cp "$MOUNT_PATH/openvpn/ta.key" "openvpn-$NAME/"
 
@@ -170,7 +170,7 @@ op_openvpn_generate() {
 	(
 		cd  "$MOUNT_PATH/openvpn"
 		# Build request
-		openssl req -batch -days 3650 -nodes -new -config "openssl.cnf" \
+		openssl req -days 3650 -nodes -new -config "openssl.cnf" \
 			-keyout "$NAME.key" -out "$NAME.csr"
 		# Sign request
 		openssl ca -days 3650 -config "openssl.cnf" \
diff --git a/shellrc b/shellrc
index 10f6f2c..b26c8a8 100644
--- a/shellrc
+++ b/shellrc
@@ -15,6 +15,8 @@ else
 	alias make="make -j$(nproc)"
 fi
 alias ll='ls -lh'
+alias df='df -h'
+alias du='du -h'
 alias grep='grep --color=auto'
 alias git='LANG=en_GB git'
 alias gdb='gdb -q'
@@ -51,8 +53,8 @@ fi
 # Generate random password (optionally takes length of password as first argument)
 genpasswd() {
 	local l=$1
-	if [ "$l" = "" ]; then l=16; fi
-	tr -dc A-Za-z0-9_ < /dev/urandom | head -c ${l} | xargs
+	[ -n "$l" ] || l=16
+	tr -dc A-Za-z0-9_ < /dev/urandom | head -c "$l" | xargs
 }
 
 # Clip stdin to clipboard
-- 
cgit v1.2.3