← Back to branch summary

~ubuntu-core-dev/update-notifier/ubuntu

« back to all changes in this revision

Viewing changes to data/apt-cdrom-check

  • Committer: Michael Vogt
  • Date: 2011-03-09 15:15:15 UTC
  • Revision ID: michael.vogt@ubuntu.com-20110309151515-3s24hzftwqvj7xg7
data/apt-cdrom-check, data/cddistupgrader: fix scripts for spaces in pathnames

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/apt-cdrom-check
12
12
# 
13
13
 
14
14
mount_point="$1"
15
 
upgrader_dir="$mount_point/dists/*/main/dist-upgrader/binary-all/"
16
15
addon_dir="$mount_point/app-install/"
17
16
aptoncd_file="$mount_point/aptoncd.info"
18
17
 
81
80
# so this is a CD we don't know yet and it has packages. good!
82
81
 
83
82
# now check if it contains a signed dist-upgrader
84
 
for d in $upgrader_dir; do
 
83
for d in "$mount_point"/dists/*/main/dist-upgrader/binary-all/; do
85
84
    if [ -d "$d" ]; then
86
85
        # ok, we have one, now check the authentication 
87
86
        GPG="gpgv --ignore-time-conflict --keyring /etc/apt/trusted.gpg"
88
 
        if $GPG "$d/"*.tar.gz.gpg "$d/"*.tar.gz; then
 
87
        if $GPG "$d/"*.tar.gz.gpg "$d"/*.tar.gz; then
89
88
        # verified ok, we have a valid upgrader, if it was not ok, the
90
89
        # fallback to the end is ok because we still have packages on it
91
90
            exit 2