|
Lines 2-8
Link Here
|
| 2 |
+++ debootstrap |
2 |
+++ debootstrap |
| 3 |
@@ -1,4 +1,4 @@ |
3 |
@@ -1,4 +1,4 @@ |
| 4 |
-#!/bin/sh |
4 |
-#!/bin/sh |
| 5 |
+#!/usr/local/bin/bash |
5 |
+#!/usr/bin/env bash |
| 6 |
set -e |
6 |
set -e |
| 7 |
|
7 |
|
| 8 |
VERSION='@VERSION@' |
8 |
VERSION='@VERSION@' |
|
Lines 11-31
Link Here
|
| 11 |
DEBOOTSTRAP_DIR=/debootstrap |
11 |
DEBOOTSTRAP_DIR=/debootstrap |
| 12 |
else |
12 |
else |
| 13 |
- DEBOOTSTRAP_DIR=/usr/share/debootstrap |
13 |
- DEBOOTSTRAP_DIR=/usr/share/debootstrap |
| 14 |
+ DEBOOTSTRAP_DIR=/usr/local/share/debootstrap |
14 |
+ DEBOOTSTRAP_DIR=%%PREFIX%%/share/debootstrap |
| 15 |
fi |
15 |
fi |
| 16 |
fi |
16 |
fi |
| 17 |
|
17 |
|
| 18 |
@@ -379,8 +379,8 @@ if [ $# != 0 ] ; then |
|
|
| 19 |
shift |
| 20 |
;; |
| 21 |
--keyring|--keyring=?*) |
| 22 |
- if ! gpgv --version >/dev/null 2>&1; then |
| 23 |
- error 1 NEEDGPGV "gpgv not installed, but required for Release verification" |
| 24 |
+ if ! gpgv2 --version >/dev/null 2>&1; then |
| 25 |
+ error 1 NEEDGPGV "gpgv2 not installed, but required for Release verification" |
| 26 |
fi |
| 27 |
if [ "$1" = "--keyring" ] && [ -n "$2" ]; then |
| 28 |
KEYRING="$2" |
| 29 |
@@ -536,13 +536,7 @@ fi |
18 |
@@ -536,13 +536,7 @@ fi |
| 30 |
|
19 |
|
| 31 |
########################################################################### |
20 |
########################################################################### |