fixed output and username
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 20 Jul 2016 18:35:43 +0000 (14:35 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 20 Jul 2016 18:35:43 +0000 (14:35 -0400)
edward.git/post-update

index 680a65f5f65f4065a6d401c423ada4df3d10dea4..cce060423a85aa27fd33d53f4d8819f4a3142836 100755 (executable)
@@ -6,6 +6,7 @@ local_checkout_base=/home/git/local/checkouts/edward
 package_path_base=/var/www/agpl.fsf.org/emailselfdefense.fsf.org/edward/
 package_host=agpl.fsf.org
 package_name=edward
+package_user=vcshookuser
 
 repository=/home/git/repositories/edward.git
 remote_user=edward
@@ -61,15 +62,15 @@ else
     git pull origin $branch
 fi
 
-echo -n $(date "$date_fmt"); echo " - Packing for package host"
+echo -n $(date "$date_fmt"); echo " - Packing zip and tarball for package host"
 rm -f $local_checkout_base/*tar.gz
 rm -f $local_checkout_base/*zip
 cd $local_checkout_base
-tar czv --exclude-vcs -f $package_name.tar.gz $branch
-zip -r $package_name $branch -x "*/.git/*" "*/.gitignore"
+tar czv --exclude-vcs -f $package_name.tar.gz $branch &>/dev/null
+zip -r $package_name $branch -x "*/.git/*" "*/.gitignore" &>/dev/null
 
-echo -n $(date "$date_fmt"); echo " - Pushing to packaging server: $package_host:"
-scp $package_name.zip $package_name.tar.gz $remote_user@$package_host:$package_path/
+echo -n $(date "$date_fmt"); echo " - Pushing to packaging server: https://$package_host/emailselfdefense.fsf.org/edward/"
+scp $package_name.zip $package_name.tar.gz $package_user@$package_host:$package_path/
 
 # Stop here if not updating a host
 if [ -z $target_host ]; then