← Back to branch summary

~ubuntu-branches/debian/squeeze/flashplugin-nonfree/squeeze

« back to all changes in this revision

Viewing changes to update-flashplugin-nonfree

  • Committer: Bazaar Package Importer
  • Author(s): Bart Martens
  • Date: 2008-12-07 13:44:05 UTC
  • Revision ID: james.westby@ubuntu.com-20081207134405-02bzg2p33ogjkwld
Tags: 1:1.8.1
http://bugs.debian.org/501110
http://bugs.debian.org/503689
http://bugs.debian.org/507707
http://bugs.debian.org/508036
http://bugs.debian.org/499388
http://bugs.debian.org/504993
* Moving to unstable.  Closes: #501110, #503689, #507707, #508036.
* update-flashplugin-nonfree: Tuned wget options.  Closes: #499388, #504993.

Show diffs side-by-side

added added

removed removed

Lines of Context:
update-flashplugin-nonfree
100
100
        --install)
101
101
                [ "$verbose" != "yes" ] || echo "selected action = $ACTION"
102
102
 
103
 
                downloadfile=md5.pgp.asc
 
103
                downloadfile=md5.fp10.pgp.asc
104
104
                downloadurl=http://people.debian.org/~bartm/flashplugin-nonfree/$downloadfile
105
 
                #[ `date --rfc-3339=date` != "2008-06-29" ] || downloadurl=http://127.0.0.1/flashplugin-nonfree/$downloadfile
 
105
                #[ `date --rfc-3339=date` != "2008-10-26" ] || downloadurl=http://127.0.0.1/flashplugin-nonfree/$downloadfile
106
106
 
107
107
                wgetquiet=' -q '
108
108
                wgetfast='-t 3 -T 15 '
109
 
                wgetalways=' -P . '
 
109
                wgetalways=' -nd -P . '
110
110
                wgetprogress=' -v --progress=dot:default '
111
111
 
112
112
                wgetoptions="$wgetquiet $wgetalways"
124
124
                gpg -q --homedir "." < $downloadfile > md5.txt 2> /dev/null \
125
125
                        || die_hard_with_a_cleanup "gpg rejected signature of $downloadurl"
126
126
 
127
 
                downloadfile=install_flash_player_9_linux.tar.gz
 
127
                downloadfile=install_flash_player_10_linux.tar.gz
128
128
                cachedir=/var/cache/flashplugin-nonfree
129
129
 
130
130
                [ "$verbose" != "yes" ] || [ ! -f $cachedir/$downloadfile ] || echo "copying $cachedir/$downloadfile ..."
133
133
                [ ! -f $downloadfile ] || grep $downloadfile md5.txt | md5sum -c - > /dev/null 2>&1 || rm -f $downloadfile
134
134
 
135
135
                downloadurl=http://fpdownload.macromedia.com/get/flashplayer/current/$downloadfile
136
 
                #[ `date --rfc-3339=date` != "2008-06-29" ] || downloadurl=http://127.0.0.1/flashplugin-nonfree/$downloadfile
 
136
                #[ `date --rfc-3339=date` != "2008-10-26" ] || downloadurl=http://127.0.0.1/flashplugin-nonfree/$downloadfile
137
137
 
138
138
                wgetoptions="$wgetalways $wgetprogress"
139
139
                [ "$quiet" != "yes" ] || wgetoptions="$wgetquiet $wgetalways"
153
153
                        || die_hard_with_a_cleanup "md5sum rejected a part of $downloadfile"
154
154
 
155
155
                targetdir=/usr/lib/flashplugin-nonfree
156
 
                topdir=install_flash_player_9_linux
 
156
                topdir=install_flash_player_10_linux
157
157
 
158
158
                [ "$verbose" != "yes" ] || echo "moving $topdir/libflashplayer.so to $targetdir ..."
159
159
                rm -f $targetdir/flashplayer.xpt
166
166
                [ "$verbose" != "yes" ] || echo "moving $downloadfile to $cachedir ..."
167
167
                mv -f $downloadfile $cachedir
168
168
 
 
169
                [ "$verbose" != "yes" ] || \
 
170
                update-alternatives --display flash-mozilla.so || true
 
171
 
169
172
                if [ -e /usr/bin/nspluginwrapper ]
170
173
                then
171
174
                        [ "$verbose" != "yes" ] || echo "calling nspluginwrapper ..."
183
186
                                || die_hard_with_a_cleanup "update-alternatives failed to install flash-mozilla.so"
184
187
                fi
185
188
 
 
189
                [ "$verbose" != "yes" ] || \
 
190
                update-alternatives --display flash-mozilla.so || true
 
191
 
186
192
                [ "$verbose" != "yes" ] || echo "end of action $ACTION"
187
193
 
188
194
                ;;