From 2c80d6f24c0fc5abd4c7ec92aaadef5953c2d43a Mon Sep 17 00:00:00 2001
From: idealogica <fre6lime@yandex.ru>
Date: Wed, 27 Mar 2019 15:08:40 +0300
Subject: [PATCH] arm arch adaptation

---
 src/ubuntu16/02_tools.sh                        | 2 +-
 src/ubuntu16/04_install_ecap.sh                 | 5 +++--
 src/ubuntu16/06_install_squid.sh                | 8 +++++---
 src/ubuntu18/scripts.squid4/04_install_squid.sh | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/ubuntu16/02_tools.sh b/src/ubuntu16/02_tools.sh
index e9add65..e22c70c 100644
--- a/src/ubuntu16/02_tools.sh
+++ b/src/ubuntu16/02_tools.sh
@@ -5,7 +5,7 @@ if [[ $EUID -ne 0 ]]; then
 fi
 
 # install build tools
-apt-get -y install devscripts build-essential fakeroot cdbs debhelper dh-autoreconf
+apt-get -y install devscripts build-essential fakeroot cdbs debhelper dh-autoreconf ed
 
 # install additional packages for new squid
 apt-get -y install \
diff --git a/src/ubuntu16/04_install_ecap.sh b/src/ubuntu16/04_install_ecap.sh
index 4c7796c..f95a799 100644
--- a/src/ubuntu16/04_install_ecap.sh
+++ b/src/ubuntu16/04_install_ecap.sh
@@ -11,8 +11,9 @@ source ecap.ver
 pushd build/libecap
 
 # install ecap packages
-dpkg --install libecap3_${ECAP_PKG}_amd64.deb
-dpkg --install libecap3-dev_${ECAP_PKG}_amd64.deb
+arch=$(dpkg --print-architecture)
+dpkg --install libecap3_${ECAP_PKG}_${arch}.deb
+dpkg --install libecap3-dev_${ECAP_PKG}_${arch}.deb
 
 # and revert
 popd
diff --git a/src/ubuntu16/06_install_squid.sh b/src/ubuntu16/06_install_squid.sh
index 0d1b3c6..9305ead 100644
--- a/src/ubuntu16/06_install_squid.sh
+++ b/src/ubuntu16/06_install_squid.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 if [[ $EUID -ne 0 ]]; then
    echo "This script must be run as root" 1>&2
    exit 1
@@ -10,11 +11,12 @@ source squid.ver
 # decend into working directory
 pushd build/squid
 
-# install ecap packages
+# install squid packages
+arch=$(dpkg --print-architecture)
 sudo apt-get install squid-langpack
 dpkg --install squid-common_${SQUID_PKG}_all.deb
-dpkg --install squid_${SQUID_PKG}_amd64.deb
-dpkg --install squidclient_${SQUID_PKG}_amd64.deb
+dpkg --install squid_${SQUID_PKG}_${arch}.deb
+dpkg --install squidclient_${SQUID_PKG}_${arch}.deb
 
 # and revert
 popd
diff --git a/src/ubuntu18/scripts.squid4/04_install_squid.sh b/src/ubuntu18/scripts.squid4/04_install_squid.sh
index 9229948..9305ead 100644
--- a/src/ubuntu18/scripts.squid4/04_install_squid.sh
+++ b/src/ubuntu18/scripts.squid4/04_install_squid.sh
@@ -12,10 +12,11 @@ source squid.ver
 pushd build/squid
 
 # install squid packages
+arch=$(dpkg --print-architecture)
 sudo apt-get install squid-langpack
 dpkg --install squid-common_${SQUID_PKG}_all.deb
-dpkg --install squid_${SQUID_PKG}_amd64.deb
-dpkg --install squidclient_${SQUID_PKG}_amd64.deb
+dpkg --install squid_${SQUID_PKG}_${arch}.deb
+dpkg --install squidclient_${SQUID_PKG}_${arch}.deb
 
 # and revert
 popd