ab19ea8 · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Fix upload script issues

ab19ea8Julian K. Arni11 years ago

scripts/upload.sh+8−8

@@ -26,13 +26,16 @@ usage () {

28upload_package () {

29− local package="$0"

29+ local package="$1"

30+ local user="$2"

31+ local pass="$3"

30− local cabalFile="$0.cabal"

32+ local cabalFile="$package.cabal"

31 pushd "$package"

33 pushd "$package"

32 local version=$(grep -i '^version:' $cabalFile | awk '{ print $2 }')

34 local version=$(grep -i '^version:' $cabalFile | awk '{ print $2 }')

33− local sdist="${package}-${version}.tar.gz"

35+ local sdist="dist/${package}-${version}.tar.gz"

34 cabal sdist

36 cabal sdist

37+ echo "User is: $user"

35− cabal upload --user="$USER" --password="$PASS" "$sdist"

38+ cabal upload --user="$user" --password="$pass" "$sdist"

36 popd

39 popd

37}

40}

@@ -40,13 +43,10 @@ upload_package () {

40if [ $# -ne 2 ] ; then

43if [ $# -ne 2 ] ; then

41 echo "expecting two arguments."

44 echo "expecting two arguments."

42 usage

45 usage

43−else

44− USER="$0"

45− PASS="$1"

46fi

48versions_equal

50for s in ${SOURCES[@]} ; do

51− upload_package "$s"

51+ upload_package "$s" "$1" "$2"

52done