Use unzip from setuphelpers instead of 7z.exe

master
Daniel Berteaud 6 years ago
parent d4b9c283c8
commit 5f69cad3e5
  1. 4
      WAPT/control
  2. 2
      setup.py

@ -1,11 +1,11 @@
package : fws-openssh package : fws-openssh
version : 7.7.2.0-3 version : 7.7.2.0-4
architecture : all architecture : all
section : base section : base
priority : optional priority : optional
maintainer : Daniel Berteaud <daniel@firewall-services.com> maintainer : Daniel Berteaud <daniel@firewall-services.com>
description : OpenSSH for Windows description : OpenSSH for Windows
depends : fws-7zip depends :
conflicts : conflicts :
maturity : DEV maturity : DEV
locale : locale :

@ -11,7 +11,7 @@ def install():
run_notfatal(r'sc stop sshd') run_notfatal(r'sc stop sshd')
killalltasks('sshd.exe') killalltasks('sshd.exe')
print(' Extract OpenSSH archive') print(' Extract OpenSSH archive')
run('"%s" e -y -o"%s" OpenSSH-Win%s.zip' % (makepath(programfiles,'7-Zip','7z.exe'),makepath(programfiles,'OpenSSH'),'64' if iswin64() else '32')) unzip('OpenSSH-Win%s.zip' % '64' if iswin64() else '32',makepath(programfiles,'OpenSSH'))
print(' Installing the service') print(' Installing the service')
run(r'powershell.exe -ExecutionPolicy Bypass -File "%s\install-sshd.ps1"' % makepath(programfiles,'OpenSSH')) run(r'powershell.exe -ExecutionPolicy Bypass -File "%s\install-sshd.ps1"' % makepath(programfiles,'OpenSSH'))
print(' Opening port 22 in the firewall') print(' Opening port 22 in the firewall')

Loading…
Cancel
Save