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 #3079 from antonlacon/retire-sed-var

Browse Source 
treewide: retire $SED
This commit is contained in:
MilhouseVH 2018-11-04 19:48:31 +00:00 committed by GitHub
commit e019ab9464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/functions
View File

@ -912,19 +912,19 @@ done
fi fi
done done
$SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ sed -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-e "s|@ADDON_NAME@|$addon_name|g" \ -e "s|@ADDON_NAME@|$addon_name|g" \
-e "s|@ADDON_VERSION@|$addon_version|g" \ -e "s|@ADDON_VERSION@|$addon_version|g" \
-e "s|@REQUIRES@|$requires|g" \ -e "s|@REQUIRES@|$requires|g" \
-e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \ -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
-e "s|@OS_VERSION@|$OS_VERSION|g" \ -e "s|@OS_VERSION@|$OS_VERSION|g" \
-e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \ -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
-e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \ -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
-e "s|@PROVIDER_NAME@|$provider_name|g" \ -e "s|@PROVIDER_NAME@|$provider_name|g" \
-e "s|@PKG_ADDON_PROVIDES@|$PKG_ADDON_PROVIDES|g" \ -e "s|@PKG_ADDON_PROVIDES@|$PKG_ADDON_PROVIDES|g" \
-e "s|@PKG_ADDON_SCREENSHOT@|$screenshots|g" \ -e "s|@PKG_ADDON_SCREENSHOT@|$screenshots|g" \
-e "s|@PKG_ADDON_BROKEN@|$PKG_ADDON_BROKEN|g" \ -e "s|@PKG_ADDON_BROKEN@|$PKG_ADDON_BROKEN|g" \
-i "$addon_xml" -i "$addon_xml"
} }
install_addon_files() { install_addon_files() {

1
config/path
View File

@ -58,7 +58,6 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
MAKE="$TOOLCHAIN/bin/make" MAKE="$TOOLCHAIN/bin/make"
MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install" MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
SED="sed -i"
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH

2
packages/addons/addon-depends/cxxtools/package.mk
View File

@ -20,7 +20,7 @@ post_makeinstall_host() {
} }
post_makeinstall_target() { post_makeinstall_target() {
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/cxxtools-config sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/cxxtools-config
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin
} }

2
packages/addons/addon-depends/tntnet/package.mk
View File

@ -29,7 +29,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
--with-stressjob=no" --with-stressjob=no"
post_makeinstall_target() { post_makeinstall_target() {
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/tntnet-config sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/tntnet-config
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin
rm -rf $INSTALL/usr/share rm -rf $INSTALL/usr/share

6
packages/addons/repository/repository.kodinerds/package.mk
View File

@ -19,9 +19,9 @@ PKG_ADDON_NAME="Kodinerds Repository"
PKG_ADDON_TYPE="xbmc.addon.repository" PKG_ADDON_TYPE="xbmc.addon.repository"
make_target() { make_target() {
$SED -e "s|@PKG_VERSION@|$PKG_VERSION|g" \ sed -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
-e "s|@PKG_REV@|$PKG_REV|g" \ -e "s|@PKG_REV@|$PKG_REV|g" \
-i addon.xml -i addon.xml
} }
addon() { addon() {

6
packages/addons/repository/repository.linuxserver.docker/package.mk
View File

@ -20,9 +20,9 @@ PKG_ADDON_NAME="LinuxServer.io Repository"
PKG_ADDON_TYPE="xbmc.addon.repository" PKG_ADDON_TYPE="xbmc.addon.repository"
make_target() { make_target() {
$SED -e "s|@PKG_VERSION@|$PKG_VERSION|g" \ sed -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
-e "s|@PKG_REV@|$PKG_REV|g" \ -e "s|@PKG_REV@|$PKG_REV|g" \
-i addon.xml -i addon.xml
} }
addon() { addon() {

6
packages/addons/script/script.config.vdr/package.mk
View File

@ -19,9 +19,9 @@ PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="dummy" PKG_ADDON_TYPE="dummy"
make_target() { make_target() {
$SED -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \ sed -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
-e "s|@OS_VERSION@|$OS_VERSION|g" \ -e "s|@OS_VERSION@|$OS_VERSION|g" \
-i addon.xml -i addon.xml
} }
addon() { addon() {

4
packages/addons/service/fd628/package.mk
View File

@ -20,8 +20,8 @@ PKG_ADDON_PROJECTS="S905 S912"
PKG_ADDON_TYPE="xbmc.service" PKG_ADDON_TYPE="xbmc.service"
make_target() { make_target() {
$SED -e "s|@PKG_VERSION@|$PKG_VERSION|g" \ sed -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
-i addon.xml -i addon.xml
} }
addon() { addon() {

4
packages/addons/service/touchscreen/package.mk
View File

@ -27,8 +27,8 @@ addon() {
cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
# set only version (revision will be added by buildsystem) # set only version (revision will be added by buildsystem)
$SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \ sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
cp $(get_build_dir tslib)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin cp $(get_build_dir tslib)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $(get_build_dir evtest)/.$TARGET_NAME/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin cp $(get_build_dir evtest)/.$TARGET_NAME/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin

4
packages/addons/service/tvheadend42/package.mk
View File

@ -107,8 +107,8 @@ addon() {
cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
# set only version (revision will be added by buildsystem) # set only version (revision will be added by buildsystem)
$SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \ sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin

10
packages/audio/taglib/package.mk
View File

@ -17,9 +17,9 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
post_makeinstall_target() { post_makeinstall_target() {
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin
# pkgconf hack # pkgconf hack
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/taglib-config
$SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc sed -e "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
$SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc sed -e "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
$SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc sed -e "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
$SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc sed -e "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
} }

2
packages/devel/ncurses/package.mk
View File

@ -60,6 +60,6 @@ PKG_CONFIGURE_OPTS_TARGET="--without-ada \
post_makeinstall_target() { post_makeinstall_target() {
cp misc/ncurses-config $TOOLCHAIN/bin cp misc/ncurses-config $TOOLCHAIN/bin
chmod +x $TOOLCHAIN/bin/ncurses-config chmod +x $TOOLCHAIN/bin/ncurses-config
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $TOOLCHAIN/bin/ncurses-config sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $TOOLCHAIN/bin/ncurses-config
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin
} }

12
packages/mediacenter/kodi/package.mk
View File

@ -266,9 +266,9 @@ post_makeinstall_target() {
cp $PKG_DIR/scripts/kodi.sh $INSTALL/usr/lib/kodi cp $PKG_DIR/scripts/kodi.sh $INSTALL/usr/lib/kodi
# Configure safe mode triggers - default 5 restarts within 900 seconds/15 minutes # Configure safe mode triggers - default 5 restarts within 900 seconds/15 minutes
$SED -e "s|@KODI_MAX_RESTARTS@|${KODI_MAX_RESTARTS:-5}|g" \ sed -e "s|@KODI_MAX_RESTARTS@|${KODI_MAX_RESTARTS:-5}|g" \
-e "s|@KODI_MAX_SECONDS@|${KODI_MAX_SECONDS:-900}|g" \ -e "s|@KODI_MAX_SECONDS@|${KODI_MAX_SECONDS:-900}|g" \
-i $INSTALL/usr/lib/kodi/kodi.sh -i $INSTALL/usr/lib/kodi/kodi.sh
mkdir -p $INSTALL/usr/sbin mkdir -p $INSTALL/usr/sbin
cp $PKG_DIR/scripts/service-addon-wrapper $INSTALL/usr/sbin cp $PKG_DIR/scripts/service-addon-wrapper $INSTALL/usr/sbin
@ -281,11 +281,11 @@ post_makeinstall_target() {
mkdir -p $INSTALL/usr/share/kodi/addons mkdir -p $INSTALL/usr/share/kodi/addons
cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/kodi/addons cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/kodi/addons
$SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.openelec.tv/addon.xml sed -e "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.openelec.tv/addon.xml
cp -R $PKG_DIR/config/os.libreelec.tv $INSTALL/usr/share/kodi/addons cp -R $PKG_DIR/config/os.libreelec.tv $INSTALL/usr/share/kodi/addons
$SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.libreelec.tv/addon.xml sed -e "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.libreelec.tv/addon.xml
cp -R $PKG_DIR/config/repository.libreelec.tv $INSTALL/usr/share/kodi/addons cp -R $PKG_DIR/config/repository.libreelec.tv $INSTALL/usr/share/kodi/addons
$SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/kodi/addons/repository.libreelec.tv/addon.xml sed -e "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
cp -R $PKG_DIR/config/repository.kodi.game $INSTALL/usr/share/kodi/addons cp -R $PKG_DIR/config/repository.kodi.game $INSTALL/usr/share/kodi/addons
mkdir -p $INSTALL/usr/share/kodi/config mkdir -p $INSTALL/usr/share/kodi/config

2
packages/multimedia/SDL2/package.mk
View File

@ -92,7 +92,7 @@ else
fi fi
post_makeinstall_target() { post_makeinstall_target() {
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/sdl2-config sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/sdl2-config
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin
} }

2
packages/print/freetype/package.mk
View File

@ -25,7 +25,7 @@ pre_configure_target() {
} }
post_makeinstall_target() { post_makeinstall_target() {
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/freetype-config sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/freetype-config
ln -v -sf $SYSROOT_PREFIX/usr/include/freetype2 $SYSROOT_PREFIX/usr/include/freetype ln -v -sf $SYSROOT_PREFIX/usr/include/freetype2 $SYSROOT_PREFIX/usr/include/freetype
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin

2
packages/textproc/libxml2/package.mk
View File

@ -26,7 +26,7 @@ PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$TOOLCHAIN"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX" PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX"
post_makeinstall_target() { post_makeinstall_target() {
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/xml2-config sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/xml2-config
rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/bin
rm -rf $INSTALL/usr/lib/xml2Conf.sh rm -rf $INSTALL/usr/lib/xml2Conf.sh

2
packages/textproc/libxslt/package.mk
View File

@ -29,7 +29,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
--without-crypto" --without-crypto"
post_makeinstall_target() { post_makeinstall_target() {
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/xslt-config sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/xslt-config
rm -rf $INSTALL/usr/bin/xsltproc rm -rf $INSTALL/usr/bin/xsltproc
rm -rf $INSTALL/usr/lib/xsltConf.sh rm -rf $INSTALL/usr/lib/xsltConf.sh