diff options
| author | Damien Raude-Morvan <drazzib@debian.org> | 2011-09-03 14:47:09 +0000 |
|---|---|---|
| committer | Damien Raude-Morvan <drazzib@debian.org> | 2011-09-03 14:47:09 +0000 |
| commit | ab5553e5e6e9cc7359e3ce97ab38bd89b8ea4995 (patch) | |
| tree | 76f25431f3e2c180c89c3f0ca881f58d241be90e /scripts | |
| parent | 98a373ad9e3fd627d92df082f91390f03be0f091 (diff) | |
| download | java-common-ab5553e5e6e9cc7359e3ce97ab38bd89b8ea4995.tar.gz | |
Merge changes from unstable (uploads by doko)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/update-java-alternatives | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/update-java-alternatives b/scripts/update-java-alternatives index aadbb5e..5e31a68 100755 --- a/scripts/update-java-alternatives +++ b/scripts/update-java-alternatives @@ -79,6 +79,11 @@ fi top=/usr/lib/jvm if [ -n "$jname" ]; then + arch=$(dpkg --print-architecture) + if [ ! -x $top/$jname/bin/java ] && [ -x $top/$jname-$arch/bin/java ]; then + echo >&2 "$prog: obsolete <jname>, please use $jname-$arch instead" + jname=$jname-$arch + fi case "$jname" in /*) jdir=$jname; jname=$(basename $jdir);; *) jdir=$top/$jname |