mythinstall: Upgrade gives popup when target isn't R8.0 or above. closes #905.

many other patches to add/change verbage to various screens.

1 files changed, 38 insertions, 15 deletions

diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index 269cc64..ae4bcc7 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -5,12 +5,11 @@ PREFIX="\/usr\/include\/mythtv"
 LIBVERSION=0.27
 VERSION=0.27.0
 
-
 function setup_links {
-rm mythinstall.bin
-rm mythbeselect.bin
-ln -s  $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin
-ln -s  $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin
+rm $MYDIR/mythinstall.bin
+rm $MYDIR/mythbeselect.bin
+ln -s  $MYDIR/src/MythVantage-app-patched/mythinstall/mythinstall $MYDIR/mythinstall.bin
+ln -s  $MYDIR/src/MythVantage-app-patched/mythbeselect/mythbeselect $MYDIR/mythbeselect.bin
 }
 
 function dl_repo {
@@ -22,10 +21,9 @@ then
     cd MythVantage-app
 #    git checkout --track -b  LinHES origin/LinHES
     cd $MYDIR
-    setup_links
     cd -
 else
-    echo "updating exisiting tree"
+    echo "----updating exisiting tree----"
     cd MythVantage-app
     git pull
     git checkout master
@@ -36,19 +34,41 @@ fi
 cd MythVantage-app
 git checkout master
 #git checkout origin/LinHES
-
+cd $MYDIR/src
+if [ -d MythVantage-app-patched ]
+then
+    echo "removing old patched dir"
+    rm -rf MythVantage-app-patched
+fi
+cp -a MythVantage-app MythVantage-app-patched
+setup_links
 }
 
 dl_repo
-set -x
-sed -i "s/^LIBVERSION.*$/LIBVERSION = $LIBVERSION/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-sed -i "s/^VERSION.*$/VERSION = $VERSION/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-sed -i "s/^PREFIX.*$/PREFIX = $PREFIX/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
 
+#patches
+patches=('fileshare.cpp.patch' 'installdialog.cpp.patch' 'installationtype.cpp.patch'
+         'installsettings.cpp.patch' 'infrared.cpp.patch' 'misc_settings.cpp.patch'
+         'xorgsettings.cpp.patch' 'xorgsettings.h.patch' )
+
+echo "--------------------------applying patches------------------------------"
+cd $MYDIR/src/MythVantage-app-patched/mythinstall
+for i in `echo ${patches[@]:0}`
+do
+    echo applying $i
+    patch -N -i $MYDIR/$i || return 1
+    echo "-----------------------------"
+done
+cd $MYDIR
+echo "--------------------------done applying patches-------------------------"
 
+set -x
+sed -i "s/^LIBVERSION.*$/LIBVERSION = $LIBVERSION/g" $MYDIR/src/MythVantage-app-patched/mythinstall/mythinstall.pro
+sed -i "s/^VERSION.*$/VERSION = $VERSION/g" $MYDIR/src/MythVantage-app-patched/mythinstall/mythinstall.pro
+sed -i "s/^PREFIX.*$/PREFIX = $PREFIX/g" $MYDIR/src/MythVantage-app-patched/mythinstall/mythinstall.pro
 
-sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
+sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app-patched/mythinstall/mv_common.h
+sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app-patched/mythinstall/mv_common.h
 
 # echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
 # echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
@@ -56,7 +76,10 @@ sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common
 
 #echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
 
-cd $MYDIR/src/MythVantage-app/mythinstall && qmake
+#patch -N $MYDIR/src/MythVantage-app/mythinstall/installdialog.cpp < $MYDIR/installdialog.cpp.patch
+#patch -N $MYDIR/src/MythVantage-app/mythinstall/installationtype.cpp < $MYDIR/installationtype.cpp.patch
+
+cd $MYDIR/src/MythVantage-app-patched/mythinstall && qmake
 make || exit 1
 #cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
 #make ||exit 1