Author: pebender
Date: Sun Dec 21 14:43:04 2008
New Revision: 4112
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_CODECS
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_FLASH
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_CODECS.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Modified support for binary codecs
- Added support for 64-bit binary codecs.
- Changed the meaning of 'auto' value for MM_CODECS_URL.
- 'auto' means confrw:codecs.32.sfs for 32-bit versions of MiniMyth.
- 'auto' means confrw:codecs.64.sfs for 64-bit versions of MiniMyth.
- Modified codec download and save function so that it saves the file
to confrw:codecs.32.sfs for 32-bit versions of MiniMyth, and
to confrw:codecs.64.sfs for 64-bit versions of MiniMyth.
- Changed the sh script function so that it calls the perl function.
- Modified support for Adobe Flash player
- Changed the meaning of 'auto' value for MM_FLASH_URL.
- 'auto' means confrw:libflashplayer.32.so for 32-bit versions of
MiniMyth.
- Modified flash download and save function so that it saves the file
to confrw:libflashplayer.32.so for 32-bit versions of MiniMyth.
- Changed the sh script function so that it calls the perl function.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Dec 21
14:43:04 2008
@@ -12,6 +12,23 @@
MythTV 0.21: version 0.21.0, release-0-21-fixes branch
svn 19386.
MythTV trunk: version trunk.19387 trunk svn 19387.
+Modified support for binary codecs
+ - Added support for 64-bit binary codecs.
+ - Changed the meaning of 'auto' value for MM_CODECS_URL.
+ - 'auto' means confrw:codecs.32.sfs for 32-bit versions of
MiniMyth.
+ - 'auto' means confrw:codecs.64.sfs for 64-bit versions of
MiniMyth.
+ - Modified codec download and save function so that it saves the file
+ to confrw:codecs.32.sfs for 32-bit versions of MiniMyth, and
+ to confrw:codecs.64.sfs for 64-bit versions of MiniMyth.
+ - Changed the sh script function so that it calls the perl function.
+
+Modified support for Adobe Flash player
+ - Changed the meaning of 'auto' value for MM_FLASH_URL.
+ - 'auto' means confrw:libflashplayer.32.so for 32-bit versions of
MiniMyth.
+ - Modified flash download and save function so that it saves the file
+ to confrw:libflashplayer.32.so for 32-bit versions of MiniMyth.
+ - Changed the sh script function so that it calls the perl function.
+
Modified MiniMyth utilities
- Added mm_run_without_ss
- When run using 'mm_run_without_ss {program} [{program-arg} ...]'
it
Modified: trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html
(original)
+++ trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Sun Dec
21
14:43:04 2008
@@ -1590,8 +1590,11 @@
<p>
If the value is 'auto',
then MiniMyth will assume that the CODECs directory is in
a squashfs image file
- located in the MiniMyth read-write configuration directory
and having the name 'codecs.sfs'.
- That is, MiniMyth will assume
MM_CODECS_URL='confrw:codecs.sfs'.
+ located in the MiniMyth read-write configuration directory
and having the name 'codecs.{arch}.sfs',
+ where {arch} is either 32 or 64.
+ That is,
+ MiniMyth will assume MM_CODECS_URL='confrw:codecs.32.sfs'
when compiled for a 32-bit architecture, and
+ MiniMyth will assume MM_CODECS_URL='confrw:codecs.64.sfs'
when compiled for a 64-bit architecture.
</p>
<p>
The MythTV frontend menus contain
the 'MiniMyth Tools' menu
@@ -1602,7 +1605,9 @@
</p>
<ol>
<li>fetches the
- <a
href="http://www1.mplayerhq.hu/MPlayer/releases/codecs/";>essential CODECs
tarball</a>
+ <a
href="http://www.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2";>32-bit
essentials CODECs tarball</a>
+ or the
+ <a
href="http://www.mplayerhq.hu/MPlayer/releases/codecs/essential-amd64-20071007.tar.bz2";>64-bit
essentials CODECs tarball</a>
from the Internet,</li>
<li>creates a temporary CODECs directory,</li>
<li>puts the downloaded CODECs in the temporary CODECs
directory,</li>
@@ -1660,8 +1665,10 @@
<p>
If the value is 'auto',
then MiniMyth will assume that the file is a shared
library file
- located in the MiniMyth read-write configuration directory
and having the name 'libflashplayer.so'.
- That is, MiniMyth will assume
MM_FLASH_URL='confrw:libflashplayer.so'.
+ located in the MiniMyth read-write configuration directory
and having the name 'libflashplayer.{arch}.so',
+ where {arch} is 32.
+ That is,
+ MiniMyth will assume
MM_FLASH_URL='confrw:libflashplayer.32.so' when compiled for a 32-bit
architecture.
</p>
<p>
The MythTV frontend menus contain
the 'MiniMyth Tools' menu
@@ -1672,7 +1679,7 @@
</p>
<ol>
<li>fetches
- <a
href="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz";>Adobe
Flash Player</a>
+ <a
href="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz";>32-bit
Adobe Flash Player</a>
from the Internet,</li>
<li>creates a temporary browser plugins directory,</li>
<li>installs the downloaded Adobe Flash Player in the
temporary browser plugins directory, and</li>
@@ -1691,8 +1698,10 @@
Therefore, this setting does not apply to MythTV until
after release 0.21.x.
</p>
<p>
- The Adobe Flash Player shared library only supports 32-bit.
- Therefore, this setting does not apply to non-32-bit
builds.
+ At the this time Adobe Flash Player shared library only
supports 32-bit architectures.
+ Therefore, this setting does not apply when MiniMyth is
compiled for a 64-bit architecture.
+ Once Adobe releases the Adobe Flash Player for 64-bit
architectures,
+ MiniMyth will be updated to support it.
</p>
</dd>
</dl>
@@ -2877,7 +2886,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-12-07
+ Last Updated on 2008-12-19
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
Sun Dec 21 14:43:04 2008
@@ -611,183 +611,15 @@
}
mm_codecs_fetch_and_save() {
-
- local FILE
- local REMOTE_FILE
- local LOCAL_DIR
- local LOCAL_FILE
-
- local CODECS_BASE
- local CODECS_FILE
- local CODECS_URL
-
- FILE="codecs.sfs"
- REMOTE_FILE="${FILE}"
- LOCAL_DIR="${HOME}/tmp"
- LOCAL_FILE="${LOCAL_DIR}/${FILE}"
-
- /usr/bin/test -n "${LOCAL_DIR}" && /bin/mkdir -p "${LOCAL_DIR}"
- /usr/bin/test -n "${LOCAL_DIR}" && /usr/bin/test ! -d "${LOCAL_DIR}"
&& return
-
- CODECS_BASE="essential-20061022"
- CODECS_FILE="${CODECS_BASE}.tar.bz2"
-
CODECS_URL="http://www.mplayerhq.hu/MPlayer/releases/codecs/${CODECS_FILE}";
- /bin/rm -rf "${LOCAL_DIR}/${CODECS_BASE}"
- /bin/rm -f "${LOCAL_DIR}/${CODECS_FILE}"
- cd "${LOCAL_DIR}"
- mm_url_get "${CODECS_URL}" "${CODECS_FILE}"
- if /usr/bin/test $? -ne 0 ; then
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the codecs file because no codecs were
downloaded."
- cd "${HOME}"
- /bin/rm -rf "${LOCAL_DIR}/${CODECS_BASE}"
- /bin/rm -f "${LOCAL_DIR}/${CODECS_FILE}"
- /bin/false
- return
- fi
- /bin/tar -jxf "${CODECS_FILE}"
- /bin/rm -f "${CODECS_FILE}"
-
- if /usr/bin/test ! -d "${LOCAL_DIR}/${CODECS_BASE}" || /usr/bin/test
`/bin/ls -1 "${LOCAL_DIR}/${CODECS_BASE}" | /usr/bin/wc -l` -eq 0 ; then
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the codecs file because downloaded codecs
file was empty."
- cd "${HOME}"
- /bin/rm -rf "${LOCAL_DIR}/${CODECS_BASE}"
- /bin/false
- return
- fi
-
- cd "${LOCAL_DIR}"
- /bin/chown `/usr/bin/id -u`:`/usr/bin/id -g`
${LOCAL_DIR}/${CODECS_BASE}
- /bin/chmod 0755
${LOCAL_DIR}/${CODECS_BASE}
- /bin/chown `/usr/bin/id -u`:`/usr/bin/id -g`
${LOCAL_DIR}/${CODECS_BASE}/*
- /bin/chmod 0644
${LOCAL_DIR}/${CODECS_BASE}/*
-
- /bin/rm -f "${LOCAL_FILE}"
- /usr/bin/fakeroot /usr/bin/mksquashfs "${LOCAL_DIR}/${CODECS_BASE}"
${LOCAL_FILE} > /dev/null 2>&1
- if /usr/bin/test $? -ne 0 ; then
- cd "${HOME}"
- /bin/rm -rf "${LOCAL_DIR}/${CODECS_BASE}"
- /bin/rm -f ${LOCAL_FILE}
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the codecs file because squashfs failed."
- /bin/false
- return
- fi
-
- mm_confrw_put "${REMOTE_FILE}" "${LOCAL_FILE}"
- if /usr/bin/test $? -ne 0 ; then
- cd "${HOME}"
- /bin/rm -rf "${LOCAL_DIR}/${CODECS_BASE}"
- /bin/rm -f ${LOCAL_FILE}
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to save the codecs file."
- /bin/false
- return
- fi
-
- cd "${HOME}"
- /bin/rm -rf "${LOCAL_DIR}/${CODECS_BASE}"
- /bin/rm -f "${LOCAL_FILE}"
- /bin/true
+ /usr/bin/mm_command 'codecs_fetch_and_save'
}
-mm_extras_save() {
-
- if /usr/bin/test ! -d /usr/local ; then
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the extras file because the extras directory
does not exist."
- /bin/false
- return
- fi
- if /usr/bin/test `/bin/ls -1 /usr/local | /usr/bin/wc -l` -eq 0 ; then
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the extras file because the extras directory
is empty."
- /bin/false
- return
- fi
-
- local FILE
- local REMOTE_FILE
- local LOCAL_DIR
- local LOCAL_FILE
-
- FILE="extras.sfs"
- REMOTE_FILE="${FILE}"
- LOCAL_DIR="${HOME}/tmp"
- LOCAL_FILE="${LOCAL_DIR}/${FILE}"
-
- /bin/rm -f "${LOCAL_FILE}"
- /bin/mkdir -p "${LOCAL_DIR}"
- /usr/bin/mksquashfs /usr/local ${LOCAL_FILE} > /dev/null 2>&1
- if /usr/bin/test $? -ne 0 ; then
- /bin/rm -f ${LOCAL_FILE}
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the extras file because squashfs failed."
- /bin/false
- return
- fi
-
- mm_confrw_put "${REMOTE_FILE}" "${LOCAL_FILE}"
- if /usr/bin/test $? -ne 0 ; then
- /bin/rm -f ${LOCAL_FILE}
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to save the extras file."
- /bin/false
- return
- fi
-
- /bin/rm -f "${LOCAL_FILE}"
- /bin/true
+mm_flash_fetch_and_save() {
+ /usr/bin/mm_command 'flash_fetch_and_save'
}
mm_themecache_save() {
-
- if /usr/bin/test ! -d /home/minimyth/.mythtv/themecache ; then
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the MythTV themecache file because the
MythTV themecache directory does not exist."
- /bin/false
- return
- fi
- if /usr/bin/test ! "`cd /home/minimyth/.mythtv/themecache ; /bin/ls -1
| /bin/grep -c *`" = "1" ; then
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the MythTV themecache file because the
MythTV themecache directory does not contain exactly one cached theme."
- /bin/false
- return
- fi
-
- local FILE
- local REMOTE_FILE
- local LOCAL_DIR
- local LOCAL_FILE
-
- FILE='themecache.sfs'
- REMOTE_FILE="${FILE}"
- LOCAL_DIR="${HOME}/tmp"
- LOCAL_FILE="${LOCAL_DIR}/${FILE}"
-
- /bin/rm -f "${LOCAL_FILE}"
- /bin/mkdir -p "${LOCAL_DIR}"
- /usr/bin/mksquashfs /home/minimyth/.mythtv/themecache ${LOCAL_FILE} >
/dev/null 2>&1
- if /usr/bin/test $? -ne 0 ; then
- /bin/rm -f ${LOCAL_FILE}
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to create the MythTV themecache file because squashfs
failed."
- /bin/false
- return
- fi
-
- mm_confrw_put "${REMOTE_FILE}" "${LOCAL_FILE}"
- if /usr/bin/test $? -ne 0 ; then
- /bin/rm -f ${LOCAL_FILE}
- /usr/bin/logger -s -t minimyth -p "local0.error" \
- "failed to save the MythTV themecache file."
- /bin/false
- return
- fi
-
- /bin/rm -f "${LOCAL_FILE}"
- /bin/true
+ /usr/bin/mm_command 'themecache_save'
}
mm_message_output() {
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_CODECS
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_CODECS
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_CODECS
Sun Dec 21 14:43:04 2008
@@ -22,7 +22,12 @@
fi
if /usr/bin/test "${MM_CODECS_URL}" = "auto" ; then
- MM_CODECS_URL='confrw:codecs.sfs'
+ MM_CODECS_URL='none'
+ if /usr/bin/test -e '/lib/ld-linux.so.2' ; then
+ MM_CODECS_URL='confrw:codecs.32.sfs'
+ elif /usr/bin/test -e '/lib/ld-linux-x86-64.so.2' ; then
+ MM_CODECS_URL='confrw:codecs.64.sfs'
+ fi
fi
# Convert 'none' to empty.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_FLASH
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_FLASH
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_FLASH
Sun Dec 21 14:43:04 2008
@@ -28,7 +28,7 @@
/usr/bin/test ${MM_VERSION_MYTH_BINARY_MINOR} -gt 21 ; then
if /usr/bin/test "${MM_PLUGIN_BROWSER_ENABLED}" = "yes" ; then
if /usr/bin/test -e "/lib/ld-linux.so.2" ; then
- MM_FLASH_URL='confrw:libflashplayer.so'
+ MM_FLASH_URL='confrw:libflashplayer.32.so'
fi
fi
fi
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_CODECS.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_CODECS.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_CODECS.pm
Sun Dec 21 14:43:04 2008
@@ -19,7 +19,24 @@
value_default => 'auto',
value_valid => 'auto|none|((cifs|confro|confrw|dist|file|http|hunt|
nfs|
tftp):(//(([^:@]*)?(:([...@]*))?\@)?([^/]+))?[^?#]*(\?([^#]*))?(\#(.*))?)',
value_obsolete => 'default',
- value_auto => 'confrw:codecs.sfs',
+ value_auto => sub
+ {
+ my $minimyth = shift;
+ my $name = shift;
+
+ my $value_auto = q(none);
+
+ if (-e q(/lib/ld-linux.so.2))
+ {
+ $value_auto = q(confrw:codecs.32.sfs);
+ }
+ elsif (-e q(/lib/ld-linux-x86-64.so.2))
+ {
+ $value_auto = q(confrw:codecs.64.sfs);
+ }
+
+ return $value_auto;
+ },
value_none => ''
};
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_FLASH.pm
Sun Dec 21 14:43:04 2008
@@ -24,7 +24,7 @@
my $minimyth = shift;
my $name = shift;
- my $value_default = 'none';
+ my $value_auto = 'none';
if ( ($minimyth->var_get('MM_VERSION_MYTH_BINARY_MAJOR') > 0) ||
($minimyth->var_get('MM_VERSION_MYTH_BINARY_MINOR') > 21) )
@@ -33,12 +33,12 @@
{
if (-e '/lib/ld-linux.so.2')
{
- $value_default = 'confrw:libflashplayer.so';
+ $value_auto = 'confrw:libflashplayer.32.so';
}
}
}
- return $value_default;
+ return $value_auto;
},
value_none => ''
};
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Sun Dec 21
14:43:04 2008
@@ -1 +1 @@
-7c15fae1553443a1374f3e6264177d9c download/MiniMyth.pm
+857287ee00429522e048ae993d201f5f download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Sun Dec
21 14:43:04 2008
@@ -1882,7 +1882,24 @@
my $devnull = File::Spec->devnull;
- my $file = 'codecs.sfs';
+ my $file = undef;
+ my $codecs_base = undef;
+ if (-e q(/lib/ld-linux.so.2))
+ {
+ $file = q(codecs.32.sfs);
+ $codecs_base = q(essential-20071007);
+ }
+ elsif (-e q(/lib/ld-linux-x86-64.so.2))
+ {
+ $file = q(codecs.64.sfs);
+ $codecs_base = qq(essential-amd64-20071007);
+ }
+ else
+ {
+ $self->message_log('error', qq(failed to create binary codecs file
because could not determine required file format.));
+ return 0;
+ }
+
my $remote_file = $file;
my $local_dir = $ENV{'HOME'} . '/' . 'tmp';
my $local_file = $local_dir . '/' . $file;
@@ -1893,14 +1910,14 @@
return 0;
}
- my $codecs_base = qq(essential-20061022);
my $codecs_file = qq($codecs_base.tar.bz2);
my $codecs_url =
qq(http://www.mplayerhq.hu/MPlayer/releases/codecs/$codecs_file);
File::Path::rmtree(qq($local_dir/$codecs_base));
unlink(qq($local_dir/$codecs_file));
+ $self->message_log('info', qq(downloading binary codecs
file '$codecs_url'.));
if (! $self->url_get($codecs_url, qq($local_dir/$codecs_file)))
{
- $self->message_log('error', qq(failed to create the codecs file
because no codecs were downloaded.));
+ $self->message_log('error', qq(failed to create binary codecs file
because no codecs were downloaded.));
File::Path::rmtree(qq($local_dir/$codecs_base));
unlink(qq($local_dir/$codecs_file));
return 0;
@@ -1922,7 +1939,7 @@
}
if (! $file_found)
{
- $self->message_log('error', qq(failed to create the codecs
file because downloaded codecs file was empty.));
+ $self->message_log('error', qq(failed to create binary codecs
file because downloaded codecs file was empty.));
File::Path::rmtree(qq($local_dir/$codecs_base));
return 0;
}
@@ -1950,16 +1967,17 @@
{
File::Path::rmtree(qq($local_dir/$codecs_base));
unlink(qq($local_file));
- $self->message_log('error', qq(failed to create the codecs file
because squashfs failed.));
+ $self->message_log('error', qq(failed to create binary codecs file
because squashfs failed.));
return 0;
}
if (! $self->confrw_put($remote_file, $local_file))
{
unlink(qq($local_file));
- $self->message_log('error', qq(failed to save the codecs file.));
+ $self->message_log('error', qq(failed to save binary codecs
file.));
return 0;
}
+ $self->message_log('info', qq(saved binary codecs
file 'confrw:$remote_file'.));
unlink(qq($local_file));
@@ -1972,7 +1990,24 @@
my $devnull = File::Spec->devnull;
- my $file = 'libflashplayer.so';
+ my $file = undef;
+ my $flash_base = undef;
+ if (-e q(/lib/ld-linux.so.2))
+ {
+ $file = q(libflashplayer.32.so);
+ $flash_base = q(install_flash_player_10_linux);
+ }
+ elsif (-e q(/lib/ld-linux-x86-64.so.2))
+ {
+ $self->message_log('error', qq(failed to create Adobe Flash player
file because 64-bit file format not supported.));
+ return 0;
+ }
+ else
+ {
+ $self->message_log('error', qq(failed to create Adobe Flash player
file because could not determine required file format.));
+ return 0;
+ }
+
my $remote_file = $file;
my $local_dir = $ENV{'HOME'} . '/' . 'tmp';
my $local_file = $local_dir . '/' . $file;
@@ -1983,11 +2018,11 @@
return 0;
}
- my $flash_base = qq(install_flash_player_10_linux);
my $flash_file = qq($flash_base.tar.gz);
my $flash_url =
qq(http://fpdownload.macromedia.com/get/flashplayer/current/$flash_file);
File::Path::rmtree(qq($local_dir/$flash_base));
unlink(qq($local_dir/$flash_file));
+ $self->message_log('info', qq(downloading Adobe Flash Player
file '$flash_url'.));
if (! $self->url_get($flash_url, qq($local_dir/$flash_file)))
{
$self->message_log('error', qq(failed to create the Adobe Flash
Player file.));
@@ -1998,20 +2033,20 @@
system(qq(/bin/tar -C $local_dir -zxf $local_dir/$flash_file));
unlink(qq($local_dir/$flash_file));
- if (! -e qq($local_dir/$flash_base/$file))
+ if (! -e qq($local_dir/$flash_base/libflashplayer.so))
{
File::Path::rmtree(qq($local_dir/$flash_base));
- $self->message_log('error', qq(failed to save the Adobe Flash
Player file.));
+ $self->message_log('error', qq(failed to create the Adobe Flash
Player file.));
return 0;
}
unlink(qq($local_file));
- File::Copy::copy(qq($local_dir/$flash_base/$file), qq($local_file));
+ File::Copy::copy(qq($local_dir/$flash_base/libflashplayer.so),
qq($local_file));
if (! -e qq($local_file))
{
File::Path::rmtree(qq($local_dir/$flash_base));
unlink(qq($local_file));
- $self->message_log('error', qq(failed to save the Adobe Flash
Player file.));
+ $self->message_log('error', qq(failed to create the Adobe Flash
Player file.));
return 0;
}
@@ -2023,6 +2058,7 @@
$self->message_log('error', qq(failed to save the Adobe Flash
Player file.));
return 0;
}
+ $self->message_log('info', qq(saved Adobe Flash Player
file 'confrw:$remote_file'.));
unlink(qq($local_file));
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
