[rebrand] - more usage of APP_NAME and APP_NAME_LC in generated files

6 files changed, 13 insertions, 13 deletions

diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in
index 7dadf25a42..ccb44b6f73 100644
--- a/tools/Linux/kodi.sh.in
+++ b/tools/Linux/kodi.sh.in
@@ -119,9 +119,9 @@ print_crash_report()
   echo >> $FILE
   echo "################# LOG FILE ##################" >> $FILE
   echo >> $FILE
-  if [ -f $USERDATA_DIR/temp/xbmc.log ]
+  if [ -f $USERDATA_DIR/temp/@APP_NAME_LC@.log ]
   then
-    cat $USERDATA_DIR/temp/xbmc.log >> $FILE
+    cat $USERDATA_DIR/temp/@APP_NAME_LC@.log >> $FILE
     echo >> $FILE
   else
     echo "Logfile not found in the usual place." >> $FILE
diff --git a/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in b/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in
index 20256ee7de..db637ebcbe 100644
--- a/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in
+++ b/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in
@@ -45,7 +45,7 @@ if [ -f "$XBMC_DEPENDS_ROOT/buildtools-native/bin/dpkg-deb" ]; then
   export PATH=${bin_path}:${PATH}
 fi
 
-PACKAGE=org.xbmc.kodi-atv2
+PACKAGE=org.xbmc.@APP_NAME_LC@-atv2
 
 VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
 REVISION=0~@APP_VERSION_TAG_LC@
@@ -61,7 +61,7 @@ mkdir -p $DIRNAME/$PACKAGE/DEBIAN
 echo "Package: $PACKAGE"                          >  $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Priority: Extra"                            >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Name: @APP_NAME@-ATV2"                      >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Depends: curl, org.awkwardtv.whitelist, com.nito.updatebegone, org.xbmc.kodi-seatbeltunlock" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Depends: curl, org.awkwardtv.whitelist, com.nito.updatebegone, org.xbmc.@APP_NAME_LC@-seatbeltunlock" >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Version: $VERSION-$REVISION"                >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Architecture: iphoneos-arm"                 >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Installed-Size: $SIZE"                      >> $DIRNAME/$PACKAGE/DEBIAN/control
@@ -84,9 +84,9 @@ chmod +x $DIRNAME/$PACKAGE/DEBIAN/prerm
 # postinst: symlink @APP_NAME@.frappliance into correct location and reload Lowtide/AppleTV.
 echo "#!/bin/sh"                                  >  $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "chown -R mobile:mobile /Applications/@APP_NAME@.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /Applications/AppleTV.app/com.apple.frontrow.appliance.kodi\@720p.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /Applications/AppleTV.app/com.apple.frontrow.appliance.@APP_NAME_LC@\@720p.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "mkdir -p /private/var/mobile/Library/Caches/AppleTV/MainMenu/"  >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /private/var/mobile/Library/Caches/AppleTV/MainMenu/com.apple.frontrow.appliance.kodi@720.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /private/var/mobile/Library/Caches/AppleTV/MainMenu/com.apple.frontrow.appliance.@APP_NAME_LC@@720.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /Applications/@APP_NAME@.frappliance/TopRowIcon.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "if [ \"\`uname -r\`\" = \"10.3.1\" ]; then" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "  ln -sf /Applications/@APP_NAME@.frappliance /Applications/Lowtide.app/Appliances/@APP_NAME@.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in
index d7ed5be98a..0ec4e2e848 100644
--- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in
+++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in
@@ -46,7 +46,7 @@ if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/dpkg-deb" ]; then
   export PATH=${bin_path}:${PATH}
 fi
 
-PACKAGE=org.xbmc.kodi-ios
+PACKAGE=org.xbmc.@APP_NAME_LC@-ios
 
 VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
 REVISION=0~@APP_VERSION_TAG_LC@
diff --git a/tools/darwin/packaging/migrate_to_kodi_ios.sh.in b/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
index 50e4e71b47..e40f735cf0 100644
--- a/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
+++ b/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
@@ -1,6 +1,6 @@
 APP_NAME=@APP_NAME@
 XBMC_HOME="/var/mobile/Library/Preferences/XBMC"
-APP_HOME="/var/mobile/Library/Preferences/Kodi"
+APP_HOME="/var/mobile/Library/Preferences/@APP_NAME@"
 
 
 function needs_kodi_migration () {
@@ -24,6 +24,6 @@ needs_kodi_migration
 NEEDS_MIGRATION=$?
 if [ "$NEEDS_MIGRATION" == "1"  ]
 then
-  echo "This is the first time you install Kodi and we detected that you have an old XBMC configuration. Your XBMC configuration will now be migrated to Kodi by moving the settings folder. If you ever want to go back to XBMC please backup /var/mobile/Library/Preferences/Kodi after this installation has finished and rename it to XBMC in case you downgrade to XBMC."
+  echo "This is the first time you install @APP_NAME@ and we detected that you have an old XBMC configuration. Your XBMC configuration will now be migrated to @APP_NAME@ by moving the settings folder. If you ever want to go back to XBMC please backup /var/mobile/Library/Preferences/@APP_NAME@ after this installation has finished and rename it to XBMC in case you downgrade to XBMC."
   migrate_to_kodi
 fi
diff --git a/tools/darwin/packaging/osx/mkdmg-osx.sh.in b/tools/darwin/packaging/osx/mkdmg-osx.sh.in
index 39b0e12eb5..8a4dfe6a7b 100755
--- a/tools/darwin/packaging/osx/mkdmg-osx.sh.in
+++ b/tools/darwin/packaging/osx/mkdmg-osx.sh.in
@@ -22,7 +22,7 @@ if [ ! -d $APP ]; then
 fi
 ARCHITECTURE=`file $APP/Contents/MacOS/@APP_NAME@ | awk '{print $NF}'`
 
-PACKAGE=org.xbmc.kodi-osx
+PACKAGE=org.xbmc.@APP_NAME_LC@-osx
 
 VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
 REVISION=0~@APP_VERSION_TAG_LC@
diff --git a/tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh.in b/tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh.in
index be383634db..a17741cf89 100755
--- a/tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh.in
+++ b/tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh.in
@@ -14,7 +14,7 @@ fi
 
 DPKGDEB="dpkg-deb"
 
-PACKAGE=org.xbmc.kodi-seatbeltunlock
+PACKAGE=org.xbmc.@APP_NAME_LC@-seatbeltunlock
 
 VERSION=1.0
 REVISION=5
@@ -29,13 +29,13 @@ mkdir -p $PACKAGE/DEBIAN
 echo "Package: $PACKAGE"                                >  $PACKAGE/DEBIAN/control
 echo "Priority: Extra"                                  >> $PACKAGE/DEBIAN/control
 echo "Depends: coreutils, bsdiff, gawk"                 >> $PACKAGE/DEBIAN/control
-echo "Name: Kodi seatbelt unlock for AppleTV 2"         >> $PACKAGE/DEBIAN/control
+echo "Name: @APP_NAME@ seatbelt unlock for AppleTV 2"   >> $PACKAGE/DEBIAN/control
 echo "Version: $VERSION-$REVISION"                      >> $PACKAGE/DEBIAN/control
 echo "Architecture: iphoneos-arm"                       >> $PACKAGE/DEBIAN/control
 echo "Description: @APP_NAME@ tweeks, removes seatbelt" >> $PACKAGE/DEBIAN/control
 echo "Homepage: http://kodi.tv/"                       >> $PACKAGE/DEBIAN/control
 echo "Maintainer: Scott Davilla"                        >> $PACKAGE/DEBIAN/control
-echo "Author: Team-Kodi"                                >> $PACKAGE/DEBIAN/control
+echo "Author: Team-@APP_NAME@"                          >> $PACKAGE/DEBIAN/control
 echo "Section: Tweaks"                                  >> $PACKAGE/DEBIAN/control
 
 # postinst: find lowtide/appletv, binary patch out seatbelt-profile key,