diff --git a/packages/linux-drivers/rtl8192se/patches/rtl8192se-0019.1207.2010-remove_nasty_printk.patch b/packages/linux-drivers/rtl8192se/patches/rtl8192se-0019.1207.2010-remove_nasty_printk.patch index 6ec5714e15..7a5f0ee622 100644 --- a/packages/linux-drivers/rtl8192se/patches/rtl8192se-0019.1207.2010-remove_nasty_printk.patch +++ b/packages/linux-drivers/rtl8192se/patches/rtl8192se-0019.1207.2010-remove_nasty_printk.patch @@ -1,12 +1,12 @@ -diff -Naur rtl8192se-0019.1207.2010.orig/HAL/rtl8192/rtl_dm.c rtl8192se-0019.1207.2010/HAL/rtl8192/rtl_dm.c ---- rtl8192se-0019.1207.2010.orig/HAL/rtl8192/rtl_dm.c 2010-12-07 04:53:18.000000000 +0100 -+++ rtl8192se-0019.1207.2010/HAL/rtl8192/rtl_dm.c 2011-01-21 22:40:35.937060273 +0100 +diff -Naur rtl8192se-0019.1207.2010/HAL/rtl8192/rtl_dm.c rtl8192se-0019.1207.2010.patch/HAL/rtl8192/rtl_dm.c +--- rtl8192se-0019.1207.2010/HAL/rtl8192/rtl_dm.c 2010-12-07 04:53:18.000000000 +0100 ++++ rtl8192se-0019.1207.2010.patch/HAL/rtl8192/rtl_dm.c 2011-01-22 23:08:06.636503156 +0100 @@ -3834,7 +3834,7 @@ - if(priv->pwrdown) - { - u1Tmp = read_nic_byte(dev, 0x06); -- printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp); -+// printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp); - retval = (u1Tmp & BIT6) ? eRfOn: eRfOff; - - if(u1Tmp == 0xff) + if(priv->pwrdown) + { + u1Tmp = read_nic_byte(dev, 0x06); +- printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp); ++// printk("pwrdown, 0x6(BIT6)=%02x\n", u1Tmp); + retval = (u1Tmp & BIT6) ? eRfOn: eRfOff; + + if(u1Tmp == 0xff) diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml new file mode 100644 index 0000000000..79040012d8 --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network/SABnzbd/config/SABnzbd.conf b/packages/mediacenter/xbmc-addon-settings/init.d/05_systemconfig similarity index 67% rename from packages/network/SABnzbd/config/SABnzbd.conf rename to packages/mediacenter/xbmc-addon-settings/init.d/05_systemconfig index 99a2d7cd4c..8e5d7e761f 100644 --- a/packages/network/SABnzbd/config/SABnzbd.conf +++ b/packages/mediacenter/xbmc-addon-settings/init.d/05_systemconfig @@ -17,10 +17,18 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# SABnzbd.conf -# This configuration file allows you to setup 'SABnzbd' a -# Newsgroups downloader daemon +# +# copy userconfig and samples +# +# runlevels: openelec, textmode -# Start SABnzbd at boot ( yes / no ) - SABNZBD_START="no" +progress "copy system config" + +if [ -f /usr/share/xbmc/addons/os.openelec.settings/default_settings.xml ]; then + if [ ! -f $HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml ]; then + mkdir -p $HOME/.xbmc/userdata/addon_data/os.openelec.settings + cp /usr/share/xbmc/addons/os.openelec.settings/default_settings.xml \ + $HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml + fi +fi diff --git a/packages/sysutils/lcdproc/config/lcd.conf b/packages/mediacenter/xbmc-addon-settings/install old mode 100644 new mode 100755 similarity index 80% rename from packages/sysutils/lcdproc/config/lcd.conf rename to packages/mediacenter/xbmc-addon-settings/install index c75158e995..aa55aa15d1 --- a/packages/sysutils/lcdproc/config/lcd.conf +++ b/packages/mediacenter/xbmc-addon-settings/install @@ -1,3 +1,5 @@ +#!/bin/sh + ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) @@ -17,13 +19,9 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# lcd.conf -# This configuration file allows you to enable a LCD/VFD driver +. config/options $1 -# Valid options are "none" / "irtrans" - -# none: No LCD/VFD hardware is installed (default) -# irtrans: Use irtrans as LCD/VFD driver - -LCD_DRIVER="none" +mkdir -p $INSTALL/usr/share/xbmc/addons/os.openelec.settings + cp -R $PKG_DIR/source/* $INSTALL/usr/share/xbmc/addons/os.openelec.settings + cp -R $PKG_DIR/config/* $INSTALL/usr/share/xbmc/addons/os.openelec.settings diff --git a/packages/multimedia/hts-tvheadend/config/tv-server.conf b/packages/mediacenter/xbmc-addon-settings/meta similarity index 71% rename from packages/multimedia/hts-tvheadend/config/tv-server.conf rename to packages/mediacenter/xbmc-addon-settings/meta index da434a2416..cda7bb94a1 100644 --- a/packages/multimedia/hts-tvheadend/config/tv-server.conf +++ b/packages/mediacenter/xbmc-addon-settings/meta @@ -17,9 +17,20 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# tv-server.conf -# This configuration file allows you to setup the TV-Server +PKG_NAME="xbmc-addon-settings" +PKG_VERSION="1" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.openelec.tv" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="mediacenter" +PKG_SHORTDESC="xbmc-addon-settings: Settings dialog for OpenELEC" +PKG_LONGDESC="xbmc-addon-settings: is a settings dialog for OpenELEC" +PKG_IS_ADDON="no" -# Start TV.Headend at boot ( yes / no ) - TVHEADEND_START="no" +PKG_AUTORECONF="no" diff --git a/packages/mediacenter/xbmc-addon-settings/source/LICENSE.txt b/packages/mediacenter/xbmc-addon-settings/source/LICENSE.txt new file mode 100644 index 0000000000..4f8e8eb30c --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/LICENSE.txt @@ -0,0 +1,282 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS +------------------------------------------------------------------------- diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml new file mode 100644 index 0000000000..460fefd2ba --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml @@ -0,0 +1,16 @@ + + + + + + + + OpenElec Settings + OpenElec Settings + all + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py new file mode 100644 index 0000000000..fd5cb371a6 --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/default.py @@ -0,0 +1,20 @@ + +import os +import sys +import xbmcaddon +__scriptname__ = "OpenElecSettings" +__author__ = "stombi" +__url__ = "" +__svn_url__ = "" +__credits__ = "" +__version__ = "0.0.1" +__XBMC_Revision__ = "22240" + + +__settings__ = xbmcaddon.Addon(id='os.openelec.settings') +__language__ = __settings__.getLocalizedString +__cwd__ = __settings__.getAddonInfo('path') + +if __name__ == "__main__": + __settings__.openSettings() + diff --git a/packages/mediacenter/xbmc-addon-settings/source/icon.png b/packages/mediacenter/xbmc-addon-settings/source/icon.png new file mode 100644 index 0000000000..3e042969a2 Binary files /dev/null and b/packages/mediacenter/xbmc-addon-settings/source/icon.png differ diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml new file mode 100644 index 0000000000..da465eb0e3 --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml @@ -0,0 +1,57 @@ + + + + + Update + Update + Auto update + + + Netwerk + Standaard instellingen + Netwerknaam + Netwerk apparaat + Netwerk soort + Netwerk apparaat of MAC adres + IP instelling + Statisch IP adres + Netwerk gateway + DNS servers (gescheiden met ';') + WLAN Instellingen + WLAN SSID (router naam) + WLAN beveiliging + WLAN wachtwoord + + + LCD/VFD + Driver + Te gebruiken LCD Driver + + + TV/PVR + Configuratie + Start TV Server bij het opstarten + + + Samba + Configuratie + Start Samba bij het opstarten + + + Transmission + Configuratie + Start Transmission bij het opstarten + Gebruikers instellingen + Gebruik verificatie + Gebruikersnaam + Wachtwoord + Netwerk instellingen + Toegestane IP adressen (gescheiden met een ",") + + + SABnzbd + Configuratie + Start SABnzbd bij het opstarten + + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml new file mode 100644 index 0000000000..323f7c0f88 --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml @@ -0,0 +1,56 @@ + + + + + Update + Update + Auto update + + + Network + General + Hostname + Network Adapter + Network Technology + Network name or MAC address + IP settings + Static IP address + Network gateway + DNS servers (semicolon seperated) + WLAN settings + WLAN SSID + WLAN Security + WLAN Passphrase + + + LCD/VFD + Driver + LCD Driver to use + + + TV/PVR + Boot + Start TV Server at boot + + + Samba + Boot + Start Samba at boot + + + Transmission + Boot + Start Transmission at boot + User Settings + Use authentification + Username + Password + Network Settings + Allowed IP addresses (comma-delimited) + + + SABnzbd + Boot + Start SABnzbd at boot + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml new file mode 100644 index 0000000000..950ac49f6b --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml @@ -0,0 +1,56 @@ + + + + + Mise à jour + Mise à jour + Mise à jour automatique + + + Réseau + Général + Nom d'hote + Réseau + Interface réseau + Nom réseau ou adresse MAC + Paramètes IP + Adresse IP statique + Passerelle Réseau + Serveurs DNS (séparés par des virgules) + Paramètres WIFI + SSID + Sécurité WIFI + Passphrase + + + LCD/VFD + Pilote + Pilote LCD + + + TV/PVR + Démarrage + Lancer le serveur TV Server au démarrage + + + Samba + Démarrage + Lancer Samba au démarrage + + + Transmission + Démarrage + Lancer Transmission au démarrage + Préférences utilisateur + Utiliser une authentification + Nom d'utilisateur + Mot de passe + Préférences réseau + Adresses IP autorisées (séparées par des virgules) + + + SABnzbd + Démarrage + Lancer SABnzbd au démarrage + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml new file mode 100644 index 0000000000..e666a7e6a3 --- /dev/null +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index d5dba3a5aa..22e3bd97ba 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/multimedia/hts-tvheadend/init.d/81_tvheadend b/packages/multimedia/hts-tvheadend/init.d/81_tvheadend index adcf6db89f..efb804bafe 100644 --- a/packages/multimedia/hts-tvheadend/init.d/81_tvheadend +++ b/packages/multimedia/hts-tvheadend/init.d/81_tvheadend @@ -22,9 +22,11 @@ # # runlevels: openelec, textmode +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + ( - if [ -f /storage/.config/tv-server.conf ]; then - . /storage/.config/tv-server.conf + if [ -f "$OPENELEC_SETTINGS" ]; then + TVHEADEND_START=`grep TVHEADEND_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` if [ "$TVHEADEND_START" = "yes" ]; then progress "starting TV Server" diff --git a/packages/multimedia/hts-tvheadend/install b/packages/multimedia/hts-tvheadend/install index 6ad1ddeff8..accbea5078 100755 --- a/packages/multimedia/hts-tvheadend/install +++ b/packages/multimedia/hts-tvheadend/install @@ -24,6 +24,3 @@ mkdir -p $INSTALL/usr/bin cp -P $PKG_BUILD/build.Linux/tvheadend $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/tv-server.conf $INSTALL/usr/config diff --git a/packages/network/SABnzbd/config/sabnzbd-https.service b/packages/network/SABnzbd/config/sabnzbd-https.service index e7dac07d12..78e86226a8 100644 --- a/packages/network/SABnzbd/config/sabnzbd-https.service +++ b/packages/network/SABnzbd/config/sabnzbd-https.service @@ -4,7 +4,7 @@ SABnzbd Server on %h (secured) _http._tcp - 9090 + 8081 path=/index.html diff --git a/packages/network/SABnzbd/config/sabnzbd.config b/packages/network/SABnzbd/config/sabnzbd.config index 6c5bc91c48..ef8c8b49a4 100644 --- a/packages/network/SABnzbd/config/sabnzbd.config +++ b/packages/network/SABnzbd/config/sabnzbd.config @@ -1,7 +1,7 @@ __version__ = 18 [misc] queue_complete = "" - https_port = 9090 + https_port = 8081 folder_rename = 1 allow_64bit_tools = 1 rss_rate = 60 diff --git a/packages/network/SABnzbd/init.d/57_SABnzbd b/packages/network/SABnzbd/init.d/57_SABnzbd index 28bfa157f5..93d9d152e0 100644 --- a/packages/network/SABnzbd/init.d/57_SABnzbd +++ b/packages/network/SABnzbd/init.d/57_SABnzbd @@ -22,9 +22,11 @@ # # runlevels: openelec, textmode +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + ( - if [ -f /storage/.config/SABnzbd.conf ]; then - . /storage/.config/SABnzbd.conf + if [ -f "$OPENELEC_SETTINGS" ]; then + SABNZBD_START=`grep SABNZBD_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` if [ "$SABNZBD_START" = "yes" ]; then diff --git a/packages/network/SABnzbd/install b/packages/network/SABnzbd/install index c37b6a9775..0bf6db656f 100755 --- a/packages/network/SABnzbd/install +++ b/packages/network/SABnzbd/install @@ -24,11 +24,6 @@ mkdir -p $INSTALL/usr/lib/$1 cp -PR $PKG_BUILD/* $INSTALL/usr/lib/$1 - -mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/SABnzbd.conf $INSTALL/usr/config - -mkdir -p $INSTALL/usr/config cp $PKG_DIR/config/sabnzbd.config $INSTALL/usr/lib/$1 mkdir -p $INSTALL/etc/avahi/services diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi index c96ebba937..c23073a39c 100644 --- a/packages/network/avahi/init.d/53_avahi +++ b/packages/network/avahi/init.d/53_avahi @@ -23,7 +23,10 @@ # runlevels: openelec, textmode ( + wait_for_network + progress "Starting Avahi Daemon" + mkdir -p /var/run/avahi-daemon avahi-daemon -D )& diff --git a/packages/network/connman/build b/packages/network/connman/build index a265d8ae9f..c2324be812 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -46,7 +46,7 @@ ac_cv_path_WPASUPPLICANT="/sbin/wpa_supplicant" \ --enable-dnsproxy=builtin \ --disable-pacrunner \ --disable-google \ - --disable-meego \ + --enable-meego=builtin \ --disable-iwmx \ --disable-iospm \ --enable-ntpd=builtin \ diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index 4c7fc1246c..1acca549ea 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -27,8 +27,22 @@ # WLAN: (WPA2): SSID, NAME, PASSPHRASE, tech: wifi mode: _managed_psk # WLAN: (WEP): SSID, NAME, PASSPHRASE, tect: wifi mode: _managed_wep -[ -f $HOME/.config/network.conf ] && . $HOME/.config/network.conf +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + +if [ -f "$OPENELEC_SETTINGS" ]; then + HOSTNAME=`grep NET_HOSTNAME $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + NETWORK=`grep NET_NETWORK $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + IFACE=`grep NET_IFACE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + IPADDRESS=`grep NET_IPADDRESS $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + GATEWAY=`grep NET_GATEWAY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + NAMESERVER=`grep NET_NAMESERVER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + SSID=`grep NET_SSID $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + SECURITY=`grep NET_SECURITY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + PASSPHRASE=`grep NET_PASSPHRASE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +fi + [ -z "$HOSTNAME" ] && HOSTNAME="openelec" +[ -z "$IFACE" ] && IFACE="eth0" # setup hostname progress "Setup hostname" @@ -53,7 +67,6 @@ # NETWORK: ( LAN / WLAN ) usleep 2000000 # TODO: wait on udev to load all drivers - [ -z "$IFACE" ] && IFACE="eth0" [ -f /sys/class/net/$IFACE/address ] && \ IFACE=`cat /sys/class/net/$IFACE/address | sed 's/://g'` diff --git a/packages/network/connman/install b/packages/network/connman/install index 6716f329c9..957f95362e 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -31,14 +31,10 @@ mkdir -p $INSTALL/etc mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d -#mkdir -p $INSTALL/usr/lib/connman/plugins -# cp $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins - mkdir -p $INSTALL/usr/sbin cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/network.conf $INSTALL/usr/config cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config if [ "$DEVTOOLS" = yes ]; then diff --git a/packages/network/libssh/meta b/packages/network/libssh/meta index 51ab36d7ca..f657837a02 100644 --- a/packages/network/libssh/meta +++ b/packages/network/libssh/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libssh" -PKG_VERSION="0.4.7" +PKG_VERSION="0.4.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OpenSource" diff --git a/packages/network/samba/build b/packages/network/samba/build index 086e77a0a2..bee748948f 100755 --- a/packages/network/samba/build +++ b/packages/network/samba/build @@ -82,6 +82,7 @@ make bin/umount.cifs if [ "$SAMBA_SERVER" = yes ]; then make bin/smbd + make bin/nmbd fi mkdir -p $SYSROOT_PREFIX/usr/lib diff --git a/packages/network/samba/install b/packages/network/samba/install index ad24d16fc4..43445ec10f 100755 --- a/packages/network/samba/install +++ b/packages/network/samba/install @@ -34,6 +34,7 @@ fi if [ "$SAMBA_SERVER" = "yes" ]; then mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin + cp $PKG_BUILD/source3/bin/nmbd $INSTALL/usr/bin mkdir -p $INSTALL/etc/samba cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba index 5516deec63..decc78b647 100644 --- a/packages/network/samba/scripts/52_samba +++ b/packages/network/samba/scripts/52_samba @@ -22,11 +22,13 @@ # # runlevels: openelec, textmode -( - if [ -f /storage/.config/network.conf ]; then - . /storage/.config/network.conf +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" - if [ ! "$SAMBA_START" = "no" ]; then +( + if [ -f "$OPENELEC_SETTINGS" ]; then + SAMBA_START=`grep SAMBA_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + + if [ "$SAMBA_START" = "yes" ]; then wait_for_network @@ -43,6 +45,7 @@ mkdir -p /var/log/samba smbd --daemon $SMB_ARG > /dev/null 2>&1 + nmbd --daemon $SMB_ARG > /dev/null 2>&1 fi fi )& diff --git a/packages/network/transmission/config/transmission.conf b/packages/network/transmission/config/transmission.conf deleted file mode 100644 index 5872aa16e9..0000000000 --- a/packages/network/transmission/config/transmission.conf +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# transmission.conf - -# This configuration file allows you to setup 'Transmission' a -# BitTorrent daemon - -# Start transmission at boot ( yes / no ) - TRANSMISSION_START="no" - -# Allow RPC access to a comma-delimited whitelist of IP addresses. -# Wildcards can be specified in an address by using '*'. Default: -# "127.0.0.1" Example: "127.0.0.*,192.168.1.*" - TRANSMISSION_IP="127.0.0.1,192.168.0.*" - -# Use authentication for the web frontend ( yes / no ) - TRANSMISSION_AUTH="yes" - -# Username for logging to the webfrontend - TRANSMISSION_USER="openelec" - -# password for logging to the webfrontend - TRANSMISSION_PWD="openelec" diff --git a/packages/network/transmission/init.d/58_transmission b/packages/network/transmission/init.d/58_transmission index e2a7ad9276..8f5a2a8c24 100644 --- a/packages/network/transmission/init.d/58_transmission +++ b/packages/network/transmission/init.d/58_transmission @@ -22,11 +22,17 @@ # # runlevels: openelec, textmode -( - if [ -f /storage/.config/transmission.conf ]; then - . /storage/.config/transmission.conf +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" - if [ "$TRANSMISSION_START" = "yes" ]; then +( + if [ -f "$OPENELEC_SETTINGS" ]; then + TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + + if [ "$TRANSMISSION_START" = "yes" ]; then wait_for_network diff --git a/packages/network/transmission/install b/packages/network/transmission/install index 5c6bb3ed00..417efb15af 100755 --- a/packages/network/transmission/install +++ b/packages/network/transmission/install @@ -29,6 +29,3 @@ mkdir -p $INSTALL/usr/share/transmission/web cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web find $INSTALL/usr/share/transmission/web -name "Makefile*" -exec rm -rf {} ";" rm -rf $INSTALL/usr/share/transmission/web/LICENSE - -mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config diff --git a/packages/sysutils/lcdproc/init.d/63_lcdproc b/packages/sysutils/lcdproc/init.d/63_lcdproc index 3c3e58658b..8e7faff21b 100644 --- a/packages/sysutils/lcdproc/init.d/63_lcdproc +++ b/packages/sysutils/lcdproc/init.d/63_lcdproc @@ -22,9 +22,11 @@ # # runlevels: openelec, textmode +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + ( - if [ -f /storage/.config/lcd.conf ]; then - . /storage/.config/lcd.conf + if [ -f "$OPENELEC_SETTINGS" ]; then + LCD_DRIVER=`grep LCD_DRIVER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` if [ ! "$LCD_DRIVER" = none ]; then diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install index 637f53d7c4..1febb2e886 100755 --- a/packages/sysutils/lcdproc/install +++ b/packages/sysutils/lcdproc/install @@ -31,8 +31,5 @@ mkdir -p $INSTALL/usr/sbin mkdir -p $INSTALL/usr/lib/lcdproc cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc -mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/lcd.conf $INSTALL/usr/config - mkdir -p $INSTALL/etc cp $PKG_BUILD/LCDd.conf $INSTALL/etc diff --git a/packages/tools/autoupdate/config/update.conf b/packages/tools/autoupdate/config/update.conf deleted file mode 100644 index acd0ad3281..0000000000 --- a/packages/tools/autoupdate/config/update.conf +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# update.conf - -# This configuration file allows you to setup the update feature of -# openelec - -# The update features retain all custom settings and files from both -# the openelec base system and xbmc - -# Options are "no" / "manually" / "auto" ) - -# no: -Disable updates -# -No pop-up information about available updates -# -No automatic downloadling - -# manually: Manual updates -# -Shows pop-up information about available updates -# -No automatic downloading -# -To update: Download the required openelec version, extract -# and copy the two files "SYSTEM" and "KERNEL" to the "Update" -# share (or /storage/.update) -# Reboot the system and the update will install automatically - -# auto: Automatic updates -# -Shows pop-up information about available updates -# -New updates will be automatically downloaded -# -The system will notify you that a reboot is all that's -# required to complete the upgrade - -AUTOUPDATE=manually diff --git a/packages/tools/autoupdate/install b/packages/tools/autoupdate/install index 1332404bf6..b9541bb7a8 100755 --- a/packages/tools/autoupdate/install +++ b/packages/tools/autoupdate/install @@ -46,9 +46,6 @@ mkdir -p $INSTALL/etc if [ -f $PROJECT_DIR/$PROJECT/autoupdate/update.conf ]; then cp $PROJECT_DIR/$PROJECT/autoupdate/update.conf $INSTALL/etc - else - mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/update.conf $INSTALL/usr/config fi mkdir -p $INSTALL/etc/crontabs diff --git a/packages/tools/autoupdate/scripts/autoupdate.devel b/packages/tools/autoupdate/scripts/autoupdate.devel index 2847d1b9f9..6ab3334668 100755 --- a/packages/tools/autoupdate/scripts/autoupdate.devel +++ b/packages/tools/autoupdate/scripts/autoupdate.devel @@ -20,10 +20,24 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -[ -f /etc/update.conf ] && . /etc/update.conf -[ -f /storage/.config/update.conf ] && . /storage/.config/update.conf -[ -f /etc/repo.conf ] && . /etc/repo.conf || exit 0 -[ -n "$KEYFILE" ] && SCP_ARG="-i $KEYFILE" +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + +if [ -f /etc/update.conf ]; then + . /etc/update.conf +elif [ -f "$OPENELEC_SETTINGS" ]; then + AUTOUPDATE=`grep UPDATE_AUTO $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +else + exit 0 +fi + +if [ -f /etc/repo.conf ]; then + . /etc/repo.conf + if [ -n "$KEYFILE" ]; then + SCP_ARG="-i $KEYFILE" + fi +else + exit 0 +fi download () { case "$DL_METHOD" in @@ -74,7 +88,7 @@ if [ ! -f /var/lock/update.lock ]; then elif [ "$AUTOUPDATE" = "auto" ]; then # show a message if a new version is avaible - send_message "New update avaible: r$NEW_VERSION - downloading and extract the new version..." + send_message "New update avaible: r$NEW_VERSION - downloading and extracting the new version..." # locking autoupdate touch /var/lock/update.lock diff --git a/packages/tools/autoupdate/scripts/autoupdate.release b/packages/tools/autoupdate/scripts/autoupdate.release index 192b7fd67a..4243c70016 100755 --- a/packages/tools/autoupdate/scripts/autoupdate.release +++ b/packages/tools/autoupdate/scripts/autoupdate.release @@ -20,10 +20,24 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -[ -f /etc/update.conf ] && . /etc/update.conf -[ -f /storage/.config/update.conf ] && . /storage/.config/update.conf -[ -f /etc/repo.conf ] && . /etc/repo.conf || exit 0 -[ -n "$KEYFILE" ] && SCP_ARG="-i $KEYFILE" +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + +if [ -f /etc/update.conf ]; then + . /etc/update.conf +elif [ -f "$OPENELEC_SETTINGS" ]; then + AUTOUPDATE=`grep UPDATE_AUTO $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +else + exit 0 +fi + +if [ -f /etc/repo.conf ]; then + . /etc/repo.conf + if [ -n "$KEYFILE" ]; then + SCP_ARG="-i $KEYFILE" + fi +else + exit 0 +fi download () { case "$DL_METHOD" in @@ -81,7 +95,7 @@ if [ ! -f /var/lock/update.lock ]; then elif [ "$AUTOUPDATE" = "auto" ]; then # show a message if a new version is avaible - send_message "New update avaible: $NEW_VERSION - downloading and extract the new version..." + send_message "New update avaible: $NEW_VERSION - downloading and extracting the new version..." # locking autoupdate touch /var/lock/update.lock