diff options
| author | Scott Ullrich <sullrich@gmail.com> | 2011-11-02 14:26:02 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@gmail.com> | 2011-11-02 14:26:02 -0400 |
| commit | 95aaa702ee604103328f6a45bc1a5ad78b151aaa (patch) | |
| tree | 95c314dc6076379db9dc245bfdaa0886495894ec | |
| parent | 775dd7ab660486ab2d8fafa06622ef7fd9af1078 (diff) | |
| download | pfsense-packages-95aaa702ee604103328f6a45bc1a5ad78b151aaa.tar.gz pfsense-packages-95aaa702ee604103328f6a45bc1a5ad78b151aaa.tar.bz2 pfsense-packages-95aaa702ee604103328f6a45bc1a5ad78b151aaa.zip | |
Correct path to binary
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 0223a7ef..cd436929 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -639,7 +639,10 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco $shkeyfile = "{$tempdir}/{$shkeyfile}"; file_put_contents("{$shkeyfile}", base64_decode($settings['shared_key'])); - exec("cd {$tempdir}/.. && /usr/local/bin/zip -r {$g['tmp_path']}/{$prefix}-config.zip {$prefix}"); + if(file_exists("/usr/pbi/zip-{$uname_p}/bin/zip")) + exec("cd {$tempdir}/.. && /usr/pbi/zip-{$uname_p}/bin/zip -r {$g['tmp_path']}/{$prefix}-config.zip {$prefix}"); + else + exec("cd {$tempdir}/.. && /usr/local/bin/zip -r {$g['tmp_path']}/{$prefix}-config.zip {$prefix}"); // Remove temporary directory exec("rm -rf {$tempdir}"); |