Kouhei Sutou
null+****@clear*****
Sun Oct 5 15:00:37 JST 2014
Kouhei Sutou 2014-10-05 15:00:37 +0900 (Sun, 05 Oct 2014) New Revision: b7ad234ab6c8e9624a38da1cda6662406245847b https://github.com/groonga/groonga/commit/b7ad234ab6c8e9624a38da1cda6662406245847b Message: packages: use "sudo" instead of running by root Modified files: packages/apt/build-deb.sh packages/yum/Vagrantfile packages/yum/build-rpm.sh Modified: packages/apt/build-deb.sh (+4 -4) =================================================================== --- packages/apt/build-deb.sh 2014-10-05 14:56:24 +0900 (ab10eab) +++ packages/apt/build-deb.sh 2014-10-05 15:00:37 +0900 (ec6789e) @@ -14,9 +14,9 @@ run() . /vagrant/tmp/env.sh swap_file=/tmp/swap -run dd if=/dev/zero of="$swap_file" bs=1024 count=4096K -run mkswap "$swap_file" -run swapon "$swap_file" +run sudo dd if=/dev/zero of="$swap_file" bs=1024 count=4096K +run sudo mkswap "$swap_file" +run sudo swapon "$swap_file" run sudo apt-get update run sudo apt-get install -y lsb-release @@ -32,7 +32,7 @@ case "${distribution}" in ;; esac -run apt-get install -V -y build-essential devscripts ${DEPENDED_PACKAGES} +run sudo apt-get install -V -y build-essential devscripts ${DEPENDED_PACKAGES} run mkdir -p build run cp /vagrant/tmp/${PACKAGE}-${VERSION}.tar.gz \ Modified: packages/yum/Vagrantfile (+1 -1) =================================================================== --- packages/yum/Vagrantfile 2014-10-05 14:56:24 +0900 (65aaef1) +++ packages/yum/Vagrantfile 2014-10-05 15:00:37 +0900 (72a00e9) @@ -32,7 +32,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define(vm[:id]) do |node| node.vm.box = vm[:id] node.vm.box_url = vm[:box_url] - node.vm.provision(:shell, :path => "build-rpm.sh") + node.vm.provision(:shell, :privileged => false, :path => "build-rpm.sh") node.vm.provider("virtualbox") do |virtual_box| virtual_box.memory = 512 virtual_box.customize ["modifyvm", :id, "--hwvirtex", "off"] Modified: packages/yum/build-rpm.sh (+7 -7) =================================================================== --- packages/yum/build-rpm.sh 2014-10-05 14:56:24 +0900 (e66ac1c) +++ packages/yum/build-rpm.sh 2014-10-05 15:00:37 +0900 (3fe9d2d) @@ -14,9 +14,9 @@ rpmbuild_options= . /vagrant/env.sh swap_file=/tmp/swap -run dd if=/dev/zero of="$swap_file" bs=1024 count=4096K -run mkswap "$swap_file" -run swapon "$swap_file" +run sudo dd if=/dev/zero of="$swap_file" bs=1024 count=4096K +run sudo mkswap "$swap_file" +run sudo swapon "$swap_file" distribution=$(cut -d " " -f 1 /etc/redhat-release | tr "A-Z" "a-z") if grep -q Linux /etc/redhat-release; then @@ -33,8 +33,8 @@ case "${architecture}" in ;; esac -run yum groupinstall -y "Development Tools" -run yum install -y rpm-build rpmdevtools tar ${DEPENDED_PACKAGES} +run sudo yum groupinstall -y "Development Tools" +run sudo yum install -y rpm-build rpmdevtools tar ${DEPENDED_PACKAGES} if [ -x /usr/bin/rpmdev-setuptree ]; then rm -rf .rpmmacros @@ -99,13 +99,13 @@ build_fedora_srpm() ;; esac - run rpm -Uvh rpmbuild/RPMS/*/*.rpm + run sudo rpm -Uvh rpmbuild/RPMS/*/*.rpm run mv rpmbuild/RPMS/*/*.rpm "${rpm_dir}/" run mv rpmbuild/SRPMS/*.rpm "${srpm_dir}/" } if ! rpm -q mecab-devel > /dev/null; then - run yum install -y wget + run sudo yum install -y wget for rpm in mecab-0.996-1.fc20.src.rpm \ mecab-ipadic-2.7.0.20070801-8.fc20.1.src.rpm \ -------------- next part -------------- HTML����������������������������...Descargar
