diff options
| author | Mads Kiilerich <mads@kiilerich.com> | 2010-03-07 02:56:27 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-03-09 12:27:57 +0100 |
| commit | 2fd3a528459b5c60f1b61fc1e9cc1cc5b3983cd6 (patch) | |
| tree | 4b8b19cfc8ce79794331ddb4ff19d70f787eda2e | |
| parent | 3bf6688187288c6580545a7b1e171ebc93fa72dd (diff) | |
| download | alsa-driver-build-unstable-2fd3a528459b5c60f1b61fc1e9cc1cc5b3983cd6.tar.gz | |
alsa-compile.sh: Remove duplicate and different packagedir assignment
From: Mads Kiilerich <mads@kiilerich.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| -rwxr-xr-x | utils/alsa-compile.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/utils/alsa-compile.sh b/utils/alsa-compile.sh index e44ee7d8b..fef46f632 100755 --- a/utils/alsa-compile.sh +++ b/utils/alsa-compile.sh @@ -989,6 +989,7 @@ fi protocol=$(echo $url | cut -d ':' -f 1) check_environment do_cmd cd $tmpdir +packagedir="$tmpdir/$package.dir" if test "$clean" = "true"; then rmpkg= @@ -1013,7 +1014,6 @@ if test "$clean" = "true"; then else echo -n "Removing package $package:" rm $tmpdir/environment.* 2> /dev/null - packagedir="$tmpdir/$package.dir" if test "$package" = "alsa-driver"; then rm -rf $tmpdir/modules.* rm -rf $tmpdir/run.awk @@ -1047,7 +1047,6 @@ if test "$kmodremove" = "true"; then fi if test "$kmodlist" = "true" -a -z "$compile"; then - packagedir="$package.dir" if test -r $packagedir; then tree=$(cat $packagedir) do_cmd cd $tree @@ -1057,7 +1056,6 @@ if test "$kmodlist" = "true" -a -z "$compile"; then fi if test -n "$kernelmodules" -a -z "$compile"; then - packagedir="$package.dir" if test -r $packagedir; then tree=$(cat $packagedir) do_cmd cd $tree @@ -1068,7 +1066,6 @@ fi case "$protocol" in http|https|file) - packagedir="$package.dir" check_compilation_environment if test -r $packagedir; then tree=$(cat $packagedir) @@ -1121,7 +1118,6 @@ http|https|file) fi ;; git) - packagedir="$package.dir" check_compilation_environment if test -r $packagedir ; then echo "$package tree $package is present." @@ -1149,17 +1145,16 @@ git) esac if test "$kmodlist" = "true"; then - packagedir="$package.dir" if test -r $packagedir; then tree=$(cat $packagedir) fi do_cmd cd $tree kernel_modules_list + exit 0 fi if test -n "$kernelmodules"; then do_cmd cd $tmpdir - packagedir="$package.dir" if test -r $packagedir; then tree=$(cat $packagedir) fi @@ -1169,7 +1164,6 @@ if test -n "$kernelmodules"; then fi if test -n "$runargs"; then - packagedir="alsa-lib.dir" if test -r $packagedir; then tree=$(cat $packagedir) fi |