Skip to content

Merging tusharpm's use-bash #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meatballhat wants to merge 5 commits into
base: default
Choose a base branch
from
Open

Merging tusharpm's use-bash #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0feb038
Fix apt source problem
tusharpm Feb 19, 2017
77c3571
Bash equivalent for add_sources.rb Ruby script
tusharpm Feb 19, 2017
cb312ba
Merge branch 'use-bash' of https://github.com/tusharpm/apt-whitelist-…
meatballhat Jul 18, 2017
6543b48
Modifications on top of #5 :heart:
meatballhat Jul 18, 2017
794b5d6
Switch back to IFS=\t + @tsv
meatballhat Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions add_sources.rb
View file
Open in desktop

This file was deleted.

23 changes: 16 additions & 7 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,25 @@
source `dirname $0`/common.sh

PKG=$1

fold_start ruby19 "Installing Ruby 1.9.1"
sudo apt-get install ruby1.9.1 -qq
fold_end ruby19
: "${APT_SOURCE_WHITELIST_UBUNTU_JSON:=https://raw.githubusercontent.com/travis-ci/apt-source-whitelist/master/ubuntu.json}"

export DEBIAN_FRONTEND=noninteractive
fold_start apt_src "Add APT sources"
cd
wget https://raw.githubusercontent.com/travis-ci/apt-source-whitelist/master/ubuntu.json
ruby1.9.1 -rjson add_sources.rb
cd "${HOME}"
OLD_IFS="${IFS}"
IFS="\t"
curl -sSL "${APT_SOURCE_WHITELIST_UBUNTU_JSON}" \
| jq -r '.[] | [.alias, .sourceline, .key_url] | @tsv' \
| while read -r alias sourceline key_url; do
echo "------------------------------"
echo "Adding ${alias}"
if [[ "${key_url}" ]]; then
curl -sSL "${key_url}" \
| sudo -E env LANG=C.UTF-8 apt-key add - || continue;
fi
sudo -E env LANG=C.UTF-8 apt-add-repository -ys "${sourceline}"
done
IFS="${OLD_IFS}"
mkdir -p /var/tmp/deb-sources
cd /var/tmp/deb-sources
sudo apt-get update -qq &>/dev/null
Expand Down
4 changes: 2 additions & 2 deletions run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ISSUE_REPO=${ISSUE_REPO:-"apt-package-whitelist"} # name of the repo that has is
GITHUB_ISSUES_URL="https://api.github.com/repos/travis-ci/${ISSUE_REPO}/issues/${ISSUE_NUMBER}"

echo "Copying build.sh"
cp build.sh common.sh add_sources.rb $HOME/build
docker exec -u travis $(< docker_id) mv $HOME/build/{build.sh,common.sh,add_sources.rb} $HOME
cp build.sh common.sh $HOME/build
docker exec -u travis $(< docker_id) mv $HOME/build/{build.sh,common.sh} $HOME

echo "Running build.sh"
docker exec -u travis $(< docker_id) bash ${HOME}/build.sh ${PACKAGE}
Expand Down