Skip to content

Commit e1dbdb8

Browse files
adamg88Team CoreELEC
adamg88
authored and
Team CoreELEC
committed
Rebrand addon for CoreELEC
1 parent 1d6ef6e commit e1dbdb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+100
-453
lines changed

‎COPYING

-363
This file was deleted.

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# SPDX-License-Identifier: GPL-2.0-or-later
22
# Copyright (C) 2009-2013 Stephan Raue ([email protected])
33
# Copyright (C) 2013 Lutz Fiebach ([email protected])
4+
# Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
45

5-
ADDON_NAME=service.libreelec.settings
6+
ADDON_NAME=service.coreelec.settings
67
ADDON_VERSION=9.0.0
7-
DISTRONAME:=LibreELEC
8+
DISTRONAME:=CoreELEC
89

910
SHELL=/bin/bash
1011
BUILDDIR=build
@@ -30,7 +31,6 @@ uninstall:
3031
$(BUILDDIR)/$(ADDON_NAME): $(BUILDDIR)/$(ADDON_NAME)/resources
3132
mkdir -p $(BUILDDIR)/$(ADDON_NAME)
3233
cp -R src/*.py $(BUILDDIR)/$(ADDON_NAME)
33-
cp COPYING $(BUILDDIR)/$(ADDON_NAME)
3434
cp addon.xml $(BUILDDIR)/$(ADDON_NAME)
3535
sed -e "s,@ADDONNAME@,$(ADDON_NAME),g" \
3636
-e "s,@ADDONVERSION@,$(ADDON_VERSION),g" \

‎addon.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<addon id="service.libreelec.settings"
2+
<addon id="service.coreelec.settings"
33
name="@DISTRONAME@ Configuration"
44
version="@ADDONVERSION@"
5-
provider-name="libreelec.tv">
5+
provider-name="CoreELEC">
66
<requires>
77
<import addon="xbmc.python" version="2.1.0"/>
88
</requires>

‎changelog.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
changelog: https://github.com/LibreELEC/service.libreelec.settings
1+
changelog: https://github.com/CoreELEC/service.coreelec.settings

‎skins/Default/1080i/service-LibreELEC-Settings-getPasskey.xml ‎skins/Default/1080i/service-CoreELEC-Settings-getPasskey.xml

File renamed without changes.

‎skins/Default/1080i/service-LibreELEC-Settings-mainWindow.xml ‎skins/Default/1080i/service-CoreELEC-Settings-mainWindow.xml

+17-17
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<textcolor>blue</textcolor>
122122
<align>left</align>
123123
<aligny>center</aligny>
124-
<label>$ADDON[service.libreelec.settings 606]</label>
124+
<label>$ADDON[service.coreelec.settings 606]</label>
125125
</control>
126126
<control type="label">
127127
<left>300</left>
@@ -141,7 +141,7 @@
141141
<textcolor>blue</textcolor>
142142
<align>left</align>
143143
<aligny>center</aligny>
144-
<label>$ADDON[service.libreelec.settings 607]</label>
144+
<label>$ADDON[service.coreelec.settings 607]</label>
145145
</control>
146146
<control type="label">
147147
<left>300</left>
@@ -161,7 +161,7 @@
161161
<textcolor>blue</textcolor>
162162
<align>left</align>
163163
<aligny>center</aligny>
164-
<label>$ADDON[service.libreelec.settings 608]</label>
164+
<label>$ADDON[service.coreelec.settings 608]</label>
165165
</control>
166166
<control type="label">
167167
<left>300</left>
@@ -180,7 +180,7 @@
180180
<height>260</height>
181181
<font>font10</font>
182182
<textcolor>white</textcolor>
183-
<label>$ADDON[service.libreelec.settings 609]</label>
183+
<label>$ADDON[service.coreelec.settings 609]</label>
184184
</control>
185185
<control type="textbox">
186186
<left>60</left>
@@ -189,7 +189,7 @@
189189
<height>400</height>
190190
<font>font10</font>
191191
<textcolor>white</textcolor>
192-
<label>$ADDON[service.libreelec.settings 610]</label>
192+
<label>$ADDON[service.coreelec.settings 610]</label>
193193
</control>
194194
<control type="textbox">
195195
<left>60</left>
@@ -444,7 +444,7 @@
444444
<height>20</height>
445445
<font>font12</font>
446446
<textcolor>blue</textcolor>
447-
<label>$ADDON[service.libreelec.settings 601]: [COLOR=white]$INFO[ListItem.Property(Interface)][/COLOR]</label>
447+
<label>$ADDON[service.coreelec.settings 601]: [COLOR=white]$INFO[ListItem.Property(Interface)][/COLOR]</label>
448448
<visible>!String.IsEmpty(ListItem.Property(Interface))</visible>
449449
</control>
450450
<!-- Connection Address -->
@@ -456,7 +456,7 @@
456456
<font>font12</font>
457457
<textcolor>blue</textcolor>
458458
<visible>String.IsEqual(ListItem.Property(State), online) | String.IsEqual(ListItem.Property(State), ready)</visible>
459-
<label>$ADDON[service.libreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
459+
<label>$ADDON[service.coreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
460460
</control>
461461
<!-- Method -->
462462
<control type="label">
@@ -466,7 +466,7 @@
466466
<height>20</height>
467467
<font>font12</font>
468468
<textcolor>blue</textcolor>
469-
<label>$ADDON[service.libreelec.settings 603]: [COLOR=white]$INFO[ListItem.Property(Method)][/COLOR]</label>
469+
<label>$ADDON[service.coreelec.settings 603]: [COLOR=white]$INFO[ListItem.Property(Method)][/COLOR]</label>
470470
</control>
471471
<!-- State -->
472472
<control type="label">
@@ -476,7 +476,7 @@
476476
<height>20</height>
477477
<font>font12</font>
478478
<textcolor>blue</textcolor>
479-
<label>$ADDON[service.libreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
479+
<label>$ADDON[service.coreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
480480
</control>
481481
<!-- Signal strength -->
482482
<control type="progress">
@@ -606,7 +606,7 @@
606606
<height>20</height>
607607
<font>font12</font>
608608
<textcolor>blue</textcolor>
609-
<label>$ADDON[service.libreelec.settings 601]: [COLOR=white]$INFO[ListItem.Property(Interface)][/COLOR]</label>
609+
<label>$ADDON[service.coreelec.settings 601]: [COLOR=white]$INFO[ListItem.Property(Interface)][/COLOR]</label>
610610
<visible>!String.IsEmpty(ListItem.Property(Interface))</visible>
611611
</control>
612612
<!-- Connection Address -->
@@ -618,7 +618,7 @@
618618
<font>font12</font>
619619
<textcolor>blue</textcolor>
620620
<visible>String.IsEqual(ListItem.Property(State), online) | String.IsEqual(ListItem.Property(State), ready)</visible>
621-
<label>$ADDON[service.libreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
621+
<label>$ADDON[service.coreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
622622
</control>
623623
<!-- Method -->
624624
<control type="label">
@@ -628,7 +628,7 @@
628628
<height>20</height>
629629
<font>font12</font>
630630
<textcolor>blue</textcolor>
631-
<label>$ADDON[service.libreelec.settings 603]: [COLOR=white]$INFO[ListItem.Property(Method)][/COLOR]</label>
631+
<label>$ADDON[service.coreelec.settings 603]: [COLOR=white]$INFO[ListItem.Property(Method)][/COLOR]</label>
632632
</control>
633633
<!-- State -->
634634
<control type="label">
@@ -638,7 +638,7 @@
638638
<height>20</height>
639639
<font>font12</font>
640640
<textcolor>blue</textcolor>
641-
<label>$ADDON[service.libreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
641+
<label>$ADDON[service.coreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
642642
</control>
643643
<!-- Signal strength -->
644644
<control type="progress">
@@ -868,7 +868,7 @@
868868
<height>20</height>
869869
<font>font12</font>
870870
<textcolor>blue</textcolor>
871-
<label>$ADDON[service.libreelec.settings 605]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
871+
<label>$ADDON[service.coreelec.settings 605]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
872872
</control>
873873
<!-- Connected State -->
874874
<control type="label">
@@ -878,7 +878,7 @@
878878
<height>20</height>
879879
<font>font12</font>
880880
<textcolor>blue</textcolor>
881-
<label>$ADDON[service.libreelec.settings 32333][COLOR=white]$INFO[ListItem.Property(ConnectedState)][/COLOR]</label>
881+
<label>$ADDON[service.coreelec.settings 32333][COLOR=white]$INFO[ListItem.Property(ConnectedState)][/COLOR]</label>
882882
</control>
883883
<!-- Paired Symbol (bottom right) -->
884884
<control type="image">
@@ -1052,7 +1052,7 @@
10521052
<height>20</height>
10531053
<font>font12</font>
10541054
<textcolor>blue</textcolor>
1055-
<label>$ADDON[service.libreelec.settings 605]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
1055+
<label>$ADDON[service.coreelec.settings 605]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
10561056
</control>
10571057
<!-- Connected State -->
10581058
<control type="label">
@@ -1062,7 +1062,7 @@
10621062
<height>20</height>
10631063
<font>font12</font>
10641064
<textcolor>blue</textcolor>
1065-
<label>$ADDON[service.libreelec.settings 32333][COLOR=white]$INFO[ListItem.Property(ConnectedState)][/COLOR]</label>
1065+
<label>$ADDON[service.coreelec.settings 32333][COLOR=white]$INFO[ListItem.Property(ConnectedState)][/COLOR]</label>
10661066
</control>
10671067
<!-- Paired Symbol (bottom right) -->
10681068
<control type="image">

‎skins/Default/1080i/service-LibreELEC-Settings-wizard.xml ‎skins/Default/1080i/service-CoreELEC-Settings-wizard.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<font>font12</font>
277277
<textcolor>blue</textcolor>
278278
<visible>String.IsEqual(ListItem.Property(State), online) | String.IsEqual(ListItem.Property(State), ready)</visible>
279-
<label>$ADDON[service.libreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
279+
<label>$ADDON[service.coreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
280280
</control>
281281
<!-- State -->
282282
<control type="label">
@@ -287,7 +287,7 @@
287287
<aligny>center</aligny>
288288
<font>font12</font>
289289
<textcolor>blue</textcolor>
290-
<label>$ADDON[service.libreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
290+
<label>$ADDON[service.coreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
291291
</control>
292292
<!-- Signal strength -->
293293
<control type="progress">
@@ -387,7 +387,7 @@
387387
<font>font12</font>
388388
<textcolor>blue</textcolor>
389389
<visible>String.IsEqual(ListItem.Property(State), online) | String.IsEqual(ListItem.Property(State), ready)</visible>
390-
<label>$ADDON[service.libreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
390+
<label>$ADDON[service.coreelec.settings 602]: [COLOR=white]$INFO[ListItem.Property(Address)][/COLOR]</label>
391391
</control>
392392
<!-- State -->
393393
<control type="label">
@@ -398,7 +398,7 @@
398398
<aligny>center</aligny>
399399
<font>font12</font>
400400
<textcolor>blue</textcolor>
401-
<label>$ADDON[service.libreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
401+
<label>$ADDON[service.coreelec.settings 604]: [COLOR=white]$INFO[ListItem.Property(State)][/COLOR]</label>
402402
</control>
403403
<!-- Signal strength -->
404404
<control type="progress">

‎src/default.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
# SPDX-License-Identifier: GPL-2.0-or-later
22
# Copyright (C) 2009-2013 Stephan Raue ([email protected])
33
# Copyright (C) 2013 Lutz Fiebach ([email protected])
4+
# Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
45

56
import xbmc
67
import socket
78
import xbmcaddon
89

9-
__scriptid__ = 'service.libreelec.settings'
10+
__scriptid__ = 'service.coreelec.settings'
1011
__addon__ = xbmcaddon.Addon(id=__scriptid__)
1112
__cwd__ = __addon__.getAddonInfo('path')
1213
__media__ = '%s/resources/skins/Default/media' % __cwd__
1314
_ = __addon__.getLocalizedString
1415

1516
try:
1617
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
17-
sock.connect('/var/run/service.libreelec.settings.sock')
18+
sock.connect('/var/run/service.coreelec.settings.sock')
1819
sock.send('openConfigurationWindow')
1920
sock.close()
2021
except Exception, e:
21-
xbmc.executebuiltin('Notification("LibreELEC", "%s", 5000, "%s/icon.png")' % (_(32390).encode('utf-8'), __media__))
22+
xbmc.executebuiltin('Notification("CoreELEC", "%s", 5000, "%s/icon.png")' % (_(32390).encode('utf-8'), __media__))

‎src/defaults.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-or-later
22
# Copyright (C) 2009-2013 Stephan Raue ([email protected])
33
# Copyright (C) 2013 Lutz Fiebach ([email protected])
4+
# Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
45

56
import os
67

@@ -18,7 +19,7 @@
1819

1920
connman = {
2021
'CONNMAN_DAEMON': '/usr/sbin/connmand',
21-
'WAIT_CONF_FILE': '%s/libreelec/network_wait' % CONFIG_CACHE,
22+
'WAIT_CONF_FILE': '%s/coreelec/network_wait' % CONFIG_CACHE,
2223
'ENABLED': lambda : (True if os.path.exists(connman['CONNMAN_DAEMON']) and not os.path.exists('/dev/.kernel_ipconfig') else False),
2324
}
2425
connman['ENABLED'] = connman['ENABLED']()
@@ -46,8 +47,8 @@
4647
'SAMBA_SMDB': '/usr/sbin/smbd',
4748
'D_SAMBA_WORKGROUP': 'WORKGROUP',
4849
'D_SAMBA_SECURE': '0',
49-
'D_SAMBA_USERNAME': 'libreelec',
50-
'D_SAMBA_PASSWORD': 'libreelec',
50+
'D_SAMBA_USERNAME': 'coreelec',
51+
'D_SAMBA_PASSWORD': 'coreelec',
5152
'D_SAMBA_MINPROTOCOL': 'SMB2',
5253
'D_SAMBA_MAXPROTOCOL': 'SMB3',
5354
'D_SAMBA_AUTOSHARE': '1',
@@ -63,7 +64,7 @@
6364
'KERNEL_CMD': '/proc/cmdline',
6465
'SET_CLOCK_CMD': '/sbin/hwclock --systohc --utc',
6566
'XBMC_RESET_FILE': '%s/reset_xbmc' % CONFIG_CACHE,
66-
'LIBREELEC_RESET_FILE': '%s/reset_oe' % CONFIG_CACHE,
67+
'COREELEC_RESET_FILE': '%s/reset_oe' % CONFIG_CACHE,
6768
'KEYBOARD_INFO': '/usr/share/X11/xkb/rules/base.xml',
6869
'UDEV_KEYBOARD_INFO': '%s/xkb/layout' % CONFIG_CACHE,
6970
'NOX_KEYBOARD_INFO': '/usr/lib/keymaps',
@@ -79,8 +80,8 @@
7980

8081
updates = {
8182
'ENABLED': not os.path.exists('/dev/.update_disabled'),
82-
'UPDATE_REQUEST_URL': 'https://update.libreelec.tv/updates.php',
83-
'UPDATE_DOWNLOAD_URL': 'http://%s.libreelec.tv/%s',
83+
'UPDATE_REQUEST_URL': 'https://update.coreelec.org/updates.php',
84+
'UPDATE_DOWNLOAD_URL': 'https://%s.coreelec.org/%s',
8485
'LOCAL_UPDATE_DIR': '/storage/.update/',
8586

8687
'RPI_FLASHING_TRIGGER': '/storage/.rpi_flash_firmware',

0 commit comments

Comments
 (0)