From: Enlightenment S. <no-...@en...> - 2009-05-19 15:27:13
|
Log: Move script to rsync. Author: quaker Date: 2009-05-19 08:27:10 -0700 (Tue, 19 May 2009) New Revision: 40747 Modified: trunk/packaging/debian/e17builder.sh Modified: trunk/packaging/debian/e17builder.sh =================================================================== --- trunk/packaging/debian/e17builder.sh 2009-05-19 15:14:19 UTC (rev 40746) +++ trunk/packaging/debian/e17builder.sh 2009-05-19 15:27:10 UTC (rev 40747) @@ -148,12 +148,12 @@ # functions download() { -echo "DOWNLOADING PACKAGES WITH SCP..." +echo "DOWNLOADING PACKAGES WITH RSYNC..." for down in ${compile_list[@]}; do case $down in - eina|eet|evas|ecore|embryo|edje|e_dbus|efreet|e17) scp -r $username@$eserver:$path/main/$down ./ + eina|eet|evas|ecore|embryo|edje|e_dbus|efreet|e17) rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/main/$down ./ ;; - *) scp -r $username@$eserver:$path/extras/$down ./ + *) rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/extras/$down ./ ;; esac done @@ -187,9 +187,9 @@ filename=$(ls $md5 | grep "$check.*.$1") rm $md5/$filename if test $(echo $check | egrep "(^eina$|^eet$|^evas$|^ecore$|^embryo$|^edje$|^edbus$|^efreet$|^e17$)"); then - scp -r $username@$eserver:$path/main/$md5/$filename $md5/$filename + rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/main/$md5/$filename $md5/$filename else - scp -r $username@$eserver:$path/extras/$md5/$filename $md5/$filename + rsync --partial --progress --recursive --rsh=ssh $username@$eserver:$path/extras/$md5/$filename $md5/$filename fi if [ "$(md5sum $md5/$check*.$1 | sed 's/ .*//')" = "$(cat SOURCES-MD5 | grep "$md5/$check.*.$1" | sed 's/ .*//')" ]; then echo "MD5 OK now." @@ -231,7 +231,7 @@ setup() { echo "INSTALLING PBUILDER..." -sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts ccache +sudo apt-get --assume-yes --force-yes install pbuilder debootstrap devscripts ccache rsync openssh-client echo "INSTALLING UBUNTU KEYRING..." if [ -z "$(dpkg -l | grep ii | grep ubuntu-keyring)" ]; then wget http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2008.03.04_all.deb @@ -377,13 +377,13 @@ if test "$up_ubuntu"; then echo "Uploading ubuntu dir." chmod -r 775 ubuntu - scp -r ubuntu $username@$eserver:/var/www/packages + rsync --partial --progress --recursive --rsh=ssh ubuntu $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/ubuntu" fi if test "$up_debian"; then echo "Uploading debian dir." chmod -r 775 debian - scp -r debian $username@$eserver:/var/www/packages + rsync --partial --progress --recursive --rsh=ssh debian $username@$eserver:/var/www/packages ssh $username@$eserver "chgrp -R www-data /var/www/packages/debian" fi echo "Done uploading." @@ -420,7 +420,7 @@ # check for deps -for deps in sudo scp dpkg-scanpackages gzip /usr/sbin/pbuilder ccache; do +for deps in sudo rsync ssh dpkg-scanpackages gzip /usr/sbin/pbuilder ccache; do which $deps if [ "$?" -ge "1" ]; then echo "Missing dep: $deps" |