@@ -15,15 +15,15 @@ function _lazy_connect_init() {
15
15
echo ' Storing secret in keychain...'
16
16
old_secret=~ /.config/lazy-connect/secret
17
17
[ -f " $old_secret " ] && rm " $old_secret "
18
- security delete-generic-password -a lazy-connect -s lazy-connect & > /dev/null
18
+ security delete-generic-password -a lazy-connect -s lazy-connect & > /dev/null
19
19
security add-generic-password -a lazy-connect -p " $secret_key " -s lazy-connect
20
20
;;
21
21
esac
22
22
_lazy_connect_vpn_refresh
23
23
}
24
24
25
25
function _lazy_connect_vpn_refresh() {
26
- local backup_file=/tmp/lazy-connect-vpns-` date +%-H-%M-%S-%F`
26
+ local backup_file=/tmp/lazy-connect-vpns-$( date +%-H-%M-%S-%F)
27
27
[ -f $_lazy_connect_config_dir /vpns ] && cp $_lazy_connect_config_dir /vpns $backup_file
28
28
osascript << EOF |
29
29
tell application "System Events"
@@ -45,7 +45,7 @@ function _lazy_connect_vpn_refresh() {
45
45
end tell
46
46
end tell
47
47
EOF
48
- tr ' ,' ' \n' | sed ' s/^[[:space:]]//g' > $_lazy_connect_config_dir /vpns
48
+ tr ' ,' ' \n' | sed ' s/^[[:space:]]//g' > $_lazy_connect_config_dir /vpns
49
49
50
50
echo " Storing the VPN list..."
51
51
if [ -f $backup_file ]; then
@@ -146,44 +146,45 @@ function lazy-connect() {
146
146
147
147
while getopts " iruh" opt; do
148
148
case $opt in
149
- h)
150
- _lazy_connect_usage
151
- return 0
152
- ;;
153
- i)
154
- _lazy_connect_init
155
- return 0
156
- ;;
157
- r)
158
- echo " Refreshing VPN list..."
159
- _lazy_connect_vpn_refresh
160
- return 0
161
- ;;
162
- u)
163
- _lazy_connect_update
164
- return 0
165
- ;;
166
- \? )
167
- echo " Invalid Option: -$OPTARG ."
168
- _lazy_connect_usage
169
- return 1
170
- ;;
171
- :)
172
- echo " Option -$OPTARG requires an argument."
173
- _lazy_connect_usage
174
- return 1
175
- ;;
149
+ h)
150
+ _lazy_connect_usage
151
+ return 0
152
+ ;;
153
+ i)
154
+ _lazy_connect_init
155
+ return 0
156
+ ;;
157
+ r)
158
+ echo " Refreshing VPN list..."
159
+ _lazy_connect_vpn_refresh
160
+ return 0
161
+ ;;
162
+ u)
163
+ _lazy_connect_update
164
+ return 0
165
+ ;;
166
+ \? )
167
+ echo " Invalid Option: -$OPTARG ."
168
+ _lazy_connect_usage
169
+ return 1
170
+ ;;
171
+ :)
172
+ echo " Option -$OPTARG requires an argument."
173
+ _lazy_connect_usage
174
+ return 1
175
+ ;;
176
176
esac
177
177
done
178
178
179
- local secret=$( security find-generic-password -a lazy-connect -w 2> /dev/null | tr -d ' \n' )
180
- if [ -z " $secret " ];
181
- then
179
+ local secret=$( security find-generic-password -a lazy-connect -w 2> /dev/null | tr -d ' \n' )
180
+ if [ -z " $secret " ]; then
182
181
echo " Secret not found in keychain. Initialize lazy-connect and try again."
183
182
return 1
184
183
fi
185
184
186
- vpn_name=$( cat $_lazy_connect_config_dir /vpns \
187
- | fzf --height=10 --ansi --reverse --query " $* " --select-1)
185
+ vpn_name=$( cat $_lazy_connect_config_dir /vpns |
186
+ fzf --height=10 --ansi --reverse --query " $* " --select-1)
188
187
[ -z " $vpn_name " ] || _lazy_connect " $vpn_name " " $secret "
189
188
}
189
+
190
+ lazy-connect " $@ "
0 commit comments