From da2c9674b6ac866bd0bc4133d8023958db5c0be0 Mon Sep 17 00:00:00 2001 From: Thiago Alves Date: Wed, 25 May 2022 08:49:55 -0400 Subject: [PATCH] Update windows installer --- background_installer.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/background_installer.sh b/background_installer.sh index a54111c..d15a47c 100755 --- a/background_installer.sh +++ b/background_installer.sh @@ -142,15 +142,18 @@ WantedBy=multi-user.target" >> openplc.service if [ "$1" == "win" ]; then echo "Installing OpenPLC on Windows" cp ./utils/apt-cyg/apt-cyg ./ - cp ./utils/apt-cyg/wget.exe /bin + if [ -f "/usr/bin/wget" ] + then + echo "found wget. Skipping install" + else + echo "wget not found. Installing from binary" + cp ./utils/apt-cyg/wget.exe /bin + fi install apt-cyg /bin apt-cyg update - # replace cygwin installed database to avoid installation errors - cp ./installed.db /etc/setup/installed.db apt-cyg install lynx - rm -f /bin/wget.exe # apt-cyg remove gcc-core gcc-g++ pkg-config automake autoconf libtool make python2 python2-pip sqlite3 - apt-cyg install wget gcc-core gcc-g++ git pkg-config automake autoconf libtool make python2 python2-pip sqlite3 python3 + apt-cyg install gcc-core gcc-g++ git pkg-config automake autoconf libtool make python2 python2-pip sqlite3 python3 lynx -source https://bootstrap.pypa.io/pip/2.7/get-pip.py > get-pip.py lynx -source https://bootstrap.pypa.io/pip/get-pip.py > get-pip3.py /usr/bin/python2 get-pip.py