minor fixes in shell scripts

This commit is contained in:
Daniel Pavel 2013-05-04 19:00:14 +02:00
parent 1f48e44cc6
commit 1b4bf7918b
4 changed files with 12 additions and 6 deletions

View File

@ -4,9 +4,10 @@ set -e
if test ! -r "$HOME/.devscripts"; then if test ! -r "$HOME/.devscripts"; then
echo "$HOME/.descripts must exist" echo "$HOME/.descripts must exist"
exit 1
fi fi
cd `dirname "$0"`/.. cd "$(dirname "$0")/.."
DEBIAN_FILES="$PWD/packaging/debian" DEBIAN_FILES="$PWD/packaging/debian"
DIST="$PWD/dist/${DISTRIBUTION:=debian}" DIST="$PWD/dist/${DISTRIBUTION:=debian}"
@ -16,7 +17,8 @@ mkdir -m 0700 -p "$BUILD_DIR"
python "setup.py" sdist --dist-dir="$BUILD_DIR" --formats=gztar python "setup.py" sdist --dist-dir="$BUILD_DIR" --formats=gztar
cd "$BUILD_DIR" cd "$BUILD_DIR"
S=`ls -1 solaar-*.tar.gz` S=$(ls -1 solaar-*.tar.gz | head -n 1)
test -r "$S"
VERSION=${S#solaar-} VERSION=${S#solaar-}
VERSION=${VERSION%.tar.gz} VERSION=${VERSION%.tar.gz}
tar xfz "$S" tar xfz "$S"

View File

@ -2,7 +2,7 @@
set -e set -e
cd `dirname "$0"`/.. cd "$(dirname "$0")/.."
DISTRIBUTION=ubuntu DISTRIBUTION=ubuntu
DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu" DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
@ -12,7 +12,7 @@ DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
DEBIAN_CHANGELOG="$PWD/packaging/debian/changelog" DEBIAN_CHANGELOG="$PWD/packaging/debian/changelog"
PPA_CHANGELOG="$DEBIAN_FILES_EXTRA/changelog" PPA_CHANGELOG="$DEBIAN_FILES_EXTRA/changelog"
latest=`head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#'` latest="$(head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#')"
cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG
$latest $latest

5
tools/clean.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
cd "$(dirname "$0")/.."
find . -type f -name '*.py[co]' -delete
find . -type d -name '__pycache__' -delete

View File

@ -5,8 +5,7 @@ if test -z "$1"; then
exit 2 exit 2
fi fi
Z=`readlink -f "$0"` HC="$(dirname "$(readlink -f "$0")")/hidconsole"
HC=`dirname "$Z"`/hidconsole
z='0 1 2 3 4 5 6 7 8 9 a b c d e f' z='0 1 2 3 4 5 6 7 8 9 a b c d e f'