git.iko.soy/typeable/servant
on master help sign in
Fix upload script issues
commit9f319963e9138b01fe8ee0c2a4b57da0e7cd4045 authorJulian K. Arni <jkarni@gmail.com> dateTue 9 Jun 2015, 12:51 (11 years ago) parentc11012d
1 file changed+8−8
scripts/upload.sh+8−8
scripts/upload.sh+8−8
@@ -26,13 +26,16 @@ usage () {
2626
2727
2828upload_package () {
29− local package="$0"
30− local cabalFile="$0.cabal"
29+ local package="$1"
30+ local user="$2"
31+ local pass="$3"
32+ local cabalFile="$package.cabal"
3133 pushd "$package"
3234 local version=$(grep -i '^version:' $cabalFile | awk '{ print $2 }')
33− local sdist="${package}-${version}.tar.gz"
35+ local sdist="dist/${package}-${version}.tar.gz"
3436 cabal sdist
35− cabal upload --user="$USER" --password="$PASS" "$sdist"
37+ echo "User is: $user"
38+ cabal upload --user="$user" --password="$pass" "$sdist"
3639 popd
3740}
3841
@@ -40,13 +43,10 @@ upload_package () {
4043if [ $# -ne 2 ] ; then
4144 echo "expecting two arguments."
4245 usage
43−else
44− USER="$0"
45− PASS="$1"
4646fi
4747
4848versions_equal
4949
5050for s in ${SOURCES[@]} ; do
51− upload_package "$s"
51+ upload_package "$s" "$1" "$2"
5252done