From adbbd83f2fc28b3018955aa705063e2320e6facb Mon Sep 17 00:00:00 2001 From: Stuart Ryan Date: Sun, 9 Aug 2015 09:36:11 +1000 Subject: [PATCH] Revert "info.plist: allow for ports-installed lpass" --- lastpass-cli-alfred-workflow.alfredworkflow | Bin 18673 -> 18552 bytes workflow/info.plist | 41 +++----------------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/lastpass-cli-alfred-workflow.alfredworkflow b/lastpass-cli-alfred-workflow.alfredworkflow index 44e7933dd11b91a367ed7966253cca41e31e0eab..9a49c67981b9828f9f15e3414fff70552502d502 100644 GIT binary patch delta 2889 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 delta 3003 zcmV;s3q)W{R0#kB zmm|himm|hib$AN^0R;5{000CO0002(Tj_G!MiTxVJVl3Ag_30u2X9eQOoCuayNa!{ z=yjzmuQLRO6e19S2Ln+oM_c<4`-J->+cN-9krJsWj+0tfNy0JHe?8OZ*NySv_cucy zt|^PXFgVH?1w98ea6;D$21mKK-HuwzeSfSRe%pR+b$>duA@aSL!`a)`>4^n7RnwYL zf;W`yL8)o}?F`2q-(&54FkViWy0d(;L2GDGO{4 zwW&O`>GmWcvtB7zn(d~ln-+?uhAVDax~-aev0AY@wRX+!e6^x6E2dE@Jx)F+fyX_x zGB`a0D;y3a|X#+_p+B)yC+7BC~aLb^K+NETf}a?M|^-`nsZ^Ww!NB z%P`b(8RJr^(>B#s(QK;qx>+<#Ty)VioQXOZ85xTxvCq`qm-x_ZH12DQ!VCn!qO7JYI4b#Vq9Z?m(S$36|guqNQcP zgR*p(7YSJ|&$=_zi%HL?GdR{KeoVE=>ooi?k`Q6#48saorzgwg!rm{4v}Q1CCXiW# z%^+Fd8_YzzYz?>p5+U7jOsz0rduU`VHWhG?355 ze?K|$BfX){(N14J?R$zF22@dYX79ikfCW^Qvjhp{#$m!f(joEum-GgAkfQtC;+8zV zHctvc^KnGybeN6Ip!+CfSA9Rk(m_J+0;g<<4(>ZCm|7$(Xe_w>qhX;Wl@%a!VY-ivG`LxD^~E)qR+jt{%`rk>3HTa8WpOR=$MI!2^7@|=%EnO`CB6vD z_fJYVifiK##^^A-rl@ZkEN*=TY0Q<*)p&jgy7j^c?s1>4upC789(5tfus!e)e;nV7 zdLdzM;R(Dw-E<)cIVMquq&a9KL)jV@ei=i-_fEnXT8KZsS0_)GvtGKCV_=Stc0WsV zyWMLj3Z{VFo$SSX{R7ZXkf)4=ObtRWh&d*?{N88f=P;rHh|W!XplJgP14&QzZ6;}3 zoAgvv)cem3MMQZp8pPkh-G3G2=%?%7nV4^|4pSj%zUjFl*XB|(7OU0;2iBS>{F@d~a9`U#+W z9zYf-RtRftltCW?ap~}eBCbb-Nyg|i;?^P&PZ&Ko=z75z@=ki2Z%7x7lr0r)f+@XOtd;vRhGBVsRt2qn)%$dD0BZz#{w zc(J=f256%%ApL7IHg{>E==U&^WXqS)C?3b04tMiW3@YuzuP|UVf?OKKF5b(j7awwy z7wUETcXpeLDD!i95wRM7c(~l1#7o>Ym3x<2Vb#WGTkqO$emuGne~?@?%M~Z|u{4=O z{&^@&IWDcHfG^{5;A}D6M>(rv&QTCfrRa%S6GKWRnMUtVpFRtP-~F!fy{ObK0`bzr zO~mQ#ZI&8$#kK*>FaJ+l?7#3_AmhUG{2u)J>%>Oz4FnW&3uVsi)wf5W?_myIScu>S z7_^UaX||O}JtwP1e|(D(Qe5We-sN9Fexj4S7^7u_#I=NF;^u?{i6Y#63|NW*K@}lp z5>?s&;TcwH2+SrayCA7dr;0lf9wzr^Shk|WrUhOSi^zZlBIL8GA`e-~1*qf*7Z#&8 zbLQt^A8_N830CRk0MnP`HBVj&0W*cT7Jmy-Fpz^L57QeIf747OsRVP=H<_|>OK?MC znyI;>{1-~5^PiDdK4vW}TkENlF2szys=%Dws;Xhos0Al?oR$vxUgNEJ;6GeG#RYsFVkFB2|LW zGnac<;=62Wc09_F^iK#f+0agx!UiBCUv* zo|~p`0i7FZMUjn{Ubb6!zK03Wa}Qwmy{^_jJm0(cf3PE}3OPe$BJ^COBCbrCfYz7* zj=7_DNkaxl?>?Q2QTOZXDfDoApC)dV3}UQ;QxD)W5ffxc_=f;zt7?xmh54q_H!EH4 z=>p9<1;3>Ul)_4k#u&ynEOIvcmi!m!1TFVszGx%p&X6_cy1rs~pmik7Q&ekTQR`^y zZ$tlYe;qwp>qwu+a%-4OGCeZ+Q?{F?CjS>{H*I|owlg~rk>MKR-aSrm zPNy}mO!*6iFAxsdDO66K%K%}4kNAN0!thF_f2NUl!`WYA>tzUpz*%9t%h44yR}7k~Kwn^}1^xK=;y%AzcJa76$l8 ze{>y4AJMjGSyU6dNg0#G(SdX$Pb6Oxd;Bk^577KS0tobd(zlne`s^5YmEli(@_q$xaQ zuC*n)*J6^#fQ)DyB9jS6!CjCG=t%Tef4*HlYl4>o_e{9sy z#O2juY!st51D~7oD&E6uyW_YU@G{r)+U`8y!@SJudS07-`+XW-n+3nkd6o6`ytX?y z_%N?hX+5v)PU8JGJKXMQ+XntsUd3ziB;1Jhi0g{x>2eCWFW%0g#)R6TCjXbh1F`Zy xvzaPG+o001etwOIfF diff --git a/workflow/info.plist b/workflow/info.plist index f9d7716..667e23e 100644 --- a/workflow/info.plist +++ b/workflow/info.plist @@ -109,12 +109,7 @@ killall -9 lpass > /dev/null 2>&1 clear launchctl setenv LPASS_AGENT_TIMEOUT 28800 && export LPASS_AGENT_TIMEOUT=28800 -for f in /usr/local/bin/lpass /opt/local/bin/lpass; do - if test -x $f; then - lpass_exec=$f - fi -done -$lpass_exec login --trust "your_email@example.com" && exit +/usr/local/bin/lpass login --trust "your@email.com" && exit type alfred.workflow.action.terminalcommand @@ -180,13 +175,7 @@ if ($details[0] eq 'error-noinstall'){ exit 1; } else { -my $lpass_exec; -foreach my $f (qw@/usr/local/bin/lpass /opt/local/bin/lpass@) { - $lpass_exec = $f - if (-x $f); -} - -my $results = qx{$lpass_exec show -c --username $details[1]}; +my $results = qx{/usr/local/bin/lpass show -c --username $details[1]}; print $details[0]; } @@ -236,16 +225,8 @@ my ($agent, $agentErr, $agentErrCode) = capture { system('ps -ef | grep "lpass \[agent\]" | grep -v grep | grep -v "perl"'); }; -my $lpass_exec; -foreach my $f (qw@/usr/local/bin/lpass /opt/local/bin/lpass@) { - $lpass_exec = $f - if (-x $f); -} - my ($results, $err, $errorCode) = capture { - system('TERM=xterm-256color && ' . - $lpass_exec . ' sync && ' . - $lpass_exec . ' ls --sync=no | grep -i ' . $search); + system('TERM=xterm-256color && /usr/local/bin/lpass sync && /usr/local/bin/lpass ls --sync=no | grep -i ' . $search); }; print qq{<?xml version="1.0"?>\n<items>\n}; @@ -339,13 +320,7 @@ exit 0; exit 1; } else { -my $lpass_exec; -foreach my $f (qw@/usr/local/bin/lpass /opt/local/bin/lpass@) { - $lpass_exec = $f - if (-x $f); -} - -my $results = qx{$lpass_exec show -c --password $details[1]}; +my $results = qx{/usr/local/bin/lpass show -c --password $details[1]}; print $details[0]; } @@ -386,13 +361,7 @@ print $details[0]; escaping 127 script - -for f in /usr/local/bin/lpass /opt/local/bin/lpass; do - if test -x $f; then - lpass_exec=$f - fi -done -$lpass_exec logout --force + /usr/local/bin/lpass logout --force type 0