jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150 from plexinc/upstream-distroname

Browse Source 
scripts : remove some hardcoded LibreELEC distro name
This commit is contained in:
MilhouseVH 2016-04-14 10:36:59 +01:00
commit b9665d0eb7
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/sysutils/busybox/package.mk
View File

@ -168,6 +168,8 @@ makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libreelec mkdir -p $INSTALL/usr/lib/libreelec
cp $PKG_DIR/scripts/functions $INSTALL/usr/lib/libreelec cp $PKG_DIR/scripts/functions $INSTALL/usr/lib/libreelec
cp $PKG_DIR/scripts/fs-resize $INSTALL/usr/lib/libreelec cp $PKG_DIR/scripts/fs-resize $INSTALL/usr/lib/libreelec
sed -e "s/@DISTRONAME@/$DISTRONAME/g" \
-i $INSTALL/usr/lib/libreelec/fs-resize
mkdir -p $INSTALL/etc mkdir -p $INSTALL/etc
cp $PKG_DIR/config/profile $INSTALL/etc cp $PKG_DIR/config/profile $INSTALL/etc
@ -250,5 +252,7 @@ makeinstall_init() {
cp $PKG_DIR/scripts/functions $INSTALL cp $PKG_DIR/scripts/functions $INSTALL
cp $PKG_DIR/scripts/init $INSTALL cp $PKG_DIR/scripts/init $INSTALL
sed -e "s/@DISTRONAME@/$DISTRONAME/g" \
-i $INSTALL/init
chmod 755 $INSTALL/init chmod 755 $INSTALL/init
} }

2
packages/sysutils/busybox/scripts/fs-resize
View File

@ -59,7 +59,7 @@ if [ -e /storage/.please_resize_me ] ; then
echo "PARTITION RESIZING IN PROGRESS" echo "PARTITION RESIZING IN PROGRESS"
echo "" echo ""
echo "Please do not reboot or turn off your LibreELEC device!" echo "Please do not reboot or turn off your @DISTRONAME@ device!"
echo "" echo ""
StartProgress spinner "Deleting /storage... " "parted -s -m $DISK rm 2 &>/dev/null" StartProgress spinner "Deleting /storage... " "parted -s -m $DISK rm 2 &>/dev/null"

4
packages/sysutils/busybox/scripts/init
View File

@ -461,7 +461,7 @@
if [ "$(( $FSCK_RET & 8 ))" = 8 ] ; then if [ "$(( $FSCK_RET & 8 ))" = 8 ] ; then
# fubar # fubar
echo "Forced fsck failed. Your system is broken beyond repair" echo "Forced fsck failed. Your system is broken beyond repair"
echo "Please re-install LibreELEC" echo "Please re-install @DISTRONAME@"
echo "" echo ""
echo "Press enter to shutdown now" echo "Press enter to shutdown now"
echo "" echo ""
@ -612,7 +612,7 @@
echo "UPGRADE IN PROGRESS" echo "UPGRADE IN PROGRESS"
echo "" echo ""
echo "Please do not reboot or turn off your LibreELEC device!" echo "Please do not reboot or turn off your @DISTRONAME@ device!"
echo "" echo ""
if [ -f "$UPDATE_TAR" ] ; then if [ -f "$UPDATE_TAR" ] ; then

2
packages/tools/installer/package.mk
View File

@ -43,6 +43,8 @@ makeinstall_target() {
post_install() { post_install() {
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp $PKG_DIR/scripts/installer $INSTALL/usr/bin cp $PKG_DIR/scripts/installer $INSTALL/usr/bin
sed -e "s/@DISTRONAME@/$DISTRONAME/g" \
-i $INSTALL/usr/bin/installer
mkdir -p $INSTALL/etc mkdir -p $INSTALL/etc
if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then

8
packages/tools/installer/scripts/installer
View File

@ -372,7 +372,7 @@ do_install_quick() {
fi fi
# install complete # install complete
MSG_TITLE="\Z1[ LibreELEC Install Complete ]\Zn" MSG_TITLE="\Z1[ @DISTRONAME@ Install Complete ]\Zn"
MSG_DETAIL="\nYou may now remove the install media and reboot\n" MSG_DETAIL="\nYou may now remove the install media and reboot\n"
dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_DETAIL" 6 52 dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_DETAIL" 6 52
@ -495,7 +495,7 @@ do_install_custom() {
rmdir $TMPDIR/part1 >> $LOGFILE 2>&1 rmdir $TMPDIR/part1 >> $LOGFILE 2>&1
# install complete # install complete
MSG_TITLE="\Z1[ LibreELEC Install Complete ]\Zn" MSG_TITLE="\Z1[ @DISTRONAME@ Install Complete ]\Zn"
MSG_DETAIL="\nYou may now remove the install media and reboot\n" MSG_DETAIL="\nYou may now remove the install media and reboot\n"
dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_DETAIL" 6 52 dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_DETAIL" 6 52
@ -591,7 +591,7 @@ menu_main() {
dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \ dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \
--title "$MSG_TITLE" --menu "$MSG_MENU" 20 70 5 \ --title "$MSG_TITLE" --menu "$MSG_MENU" 20 70 5 \
1 "Quick Install of LibreELEC" \ 1 "Quick Install of @DISTRONAME@" \
2 "Repair / Upgrade" \ 2 "Repair / Upgrade" \
3 "Show logfile" 2> $TMPDIR/mainmenu 3 "Show logfile" 2> $TMPDIR/mainmenu
@ -636,7 +636,7 @@ do_poweroff() {
# setup needed variables # setup needed variables
INSTALLER_VERSION="0.2.8" INSTALLER_VERSION="0.2.8"
OS_VERSION=$(lsb_release) OS_VERSION=$(lsb_release)
BACKTITLE="LibreELEC Installer $INSTALLER_VERSION - $OS_VERSION" BACKTITLE="@DISTRONAME@ Installer $INSTALLER_VERSION - $OS_VERSION"
TMPDIR="/tmp/installer" TMPDIR="/tmp/installer"
LOGFILE="$TMPDIR/install.log" LOGFILE="$TMPDIR/install.log"