From 406fa626611040688ed7580feaaf9efe27fb250c Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Tue, 27 Aug 2019 18:21:13 -0600 Subject: [PATCH] Fix reruns with deb downloads. Former-commit-id: dfc5db7c5eb915a67b4a4f7a83c94d3b6d1b4ffc Former-commit-id: efaca62f5a9432d903f4bf4569bd8f1b8e153482 --- debs/get-debs.sh | 8 ++++---- runme.sh | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debs/get-debs.sh b/debs/get-debs.sh index 87643366..6a6e8f9a 100755 --- a/debs/get-debs.sh +++ b/debs/get-debs.sh @@ -1,15 +1,15 @@ #!/bin/bash #Discord -wget -O discord.deb "https://discordapp.com/api/download?platform=linux&format=deb" +wget -O ../build/discord.deb "https://discordapp.com/api/download?platform=linux&format=deb" #Resilio Sync -wget -O resilio.deb "https://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb" +wget -O ../build/resilio.deb "https://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb" #VS Code (OSS) -wget -O code.deb "https://github.com/VSCodium/vscodium/releases/download/1.37.1/codium_1.37.1-1565952268_amd64.deb" +wget -O ../build/code.deb "https://github.com/VSCodium/vscodium/releases/download/1.37.1/codium_1.37.1-1565952268_amd64.deb" #Slack -wget -O slack.deb "https://downloads.slack-edge.com/linux_releases/slack-desktop-4.0.2-amd64.deb" +wget -O ../build/slack.deb "https://downloads.slack-edge.com/linux_releases/slack-desktop-4.0.2-amd64.deb" exit 0 \ No newline at end of file diff --git a/runme.sh b/runme.sh index 174e4284..32256be9 100755 --- a/runme.sh +++ b/runme.sh @@ -65,6 +65,7 @@ fi cd ./debs bash get-debs.sh dpkg-name *.deb +dpkg-name ./build/*.deb cd .. rm -rf build mkdir build @@ -76,6 +77,7 @@ Kali) cp -rv ./modules/live-build-config ./build/ mkdir ./build/live-build-config/kali-config/variant-$DESKTOP/packages.chroot cp ./debs/*.deb build/live-build-config/kali-config/variant-$DESKTOP/packages.chroot/ + cp ./build/debs/*.deb build/live-build-config/kali-config/variant-$DESKTOP/packages.chroot/ cp -rv filesystem/* ./build/live-build-config/kali-config/common/includes.chroot/ cp config/software.list.chroot ./build/live-build-config/kali-config/variant-$DESKTOP/package-lists/ cp config/pentest-distro-builder.chroot ./build/live-build-config/kali-config/common/hooks/live/