From e555fd4c2ef822984d526dd7c7ead3f40b82c8ae Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Wed, 8 Mar 2023 09:11:36 -0300 Subject: [PATCH] Switching to dl_deb.py --- Dockerfile | 18 +++++++++--------- ki6/Dockerfile | 23 +++++++++++------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index da41cd8..7990e59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,15 +6,15 @@ RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list && \ apt-get update && \ apt-get -y install make wget curl rar bzip2 librsvg2-bin ghostscript && \ apt-get -y install --no-install-recommends imagemagick python3-qrcodegen git poppler-utils && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiAuto/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiBoM/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/InteractiveHtmlBom/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/PcbDraw/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/hildogjr/KiCost/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiBot/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/set-soft/kicost-digikey-api-v3/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/kidiff/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ + dl_deb.py INTI-CMNB/KiAuto && \ + dl_deb.py INTI-CMNB/KiBoM && \ + dl_deb.py INTI-CMNB/InteractiveHtmlBom && \ + dl_deb.py INTI-CMNB/PcbDraw && \ + dl_deb.py hildogjr/KiCost && \ + dl_deb.py INTI-CMNB/KiBot && \ + dl_deb.py set-soft/kicost-digikey-api-v3 && \ + dl_deb.py INTI-CMNB/kicad-git-filters && \ + dl_deb.py INTI-CMNB/kidiff && \ apt -y install --no-install-recommends ./*.deb && \ sed -i 's///g' /etc/ImageMagick-6/policy.xml && \ sed -i 's///g' /etc/ImageMagick-6/policy.xml && \ diff --git a/ki6/Dockerfile b/ki6/Dockerfile index 4771ce2..ad0d92f 100644 --- a/ki6/Dockerfile +++ b/ki6/Dockerfile @@ -8,18 +8,17 @@ RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list && \ apt-get -y install --no-install-recommends -t bullseye-backports git && \ apt-get -y install make wget curl rar bzip2 librsvg2-bin ghostscript && \ apt-get -y install --no-install-recommends imagemagick python3-qrcodegen poppler-utils && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiAuto/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiBoM/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/InteractiveHtmlBom/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/PcbDraw/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/hildogjr/KiCost/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiBot/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/set-soft/kicost-digikey-api-v3/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/kicad-git-filters/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/kidiff/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/set-soft/pcbnewTransition/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - curl -s https://api.github.com/repos/INTI-CMNB/KiKit/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -i - && \ - rm kikit-doc* && \ + dl_deb.py INTI-CMNB/KiAuto && \ + dl_deb.py INTI-CMNB/KiBoM && \ + dl_deb.py INTI-CMNB/InteractiveHtmlBom && \ + dl_deb.py INTI-CMNB/PcbDraw && \ + dl_deb.py hildogjr/KiCost && \ + dl_deb.py INTI-CMNB/KiBot && \ + dl_deb.py set-soft/kicost-digikey-api-v3 && \ + dl_deb.py INTI-CMNB/kicad-git-filters && \ + dl_deb.py INTI-CMNB/kidiff && \ + dl_deb.py set-soft/pcbnewTransition && \ + dl_deb.py INTI-CMNB/KiKit --skip kikit-doc && \ apt -y install --no-install-recommends ./*.deb && \ sed -i 's///g' /etc/ImageMagick-6/policy.xml && \ sed -i 's///g' /etc/ImageMagick-6/policy.xml && \