LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File fix-install-skill.patch of Package plasma-mycroft (Project home:alarrosa:packages)

Index: plasma-mycroft-0.1git~20180227T231707~2e8a1ec/plasmoid/contents/ui/MsmView.qml
===================================================================
--- plasma-mycroft-0.1git~20180227T231707~2e8a1ec.orig/plasmoid/contents/ui/MsmView.qml
+++ plasma-mycroft-0.1git~20180227T231707~2e8a1ec/plasmoid/contents/ui/MsmView.qml
@@ -42,7 +42,8 @@ Rectangle {
                 
                 function exec(msmparam) {
                     if(main.coreinstallstartpath == packagemcorestartcmd){
-                        return launchinstaller.msmapp("konsole --hold -e msm install " + model.url)
+                        var bscrpt = "/usr/bin/msm"
+                        return launchinstaller.msmapp("bash " + bscrpt + " install " + model.url)
                     }
                     else {
                         var bscrpt = "/usr/share/plasma/plasmoids/org.kde.plasma.mycroftplasmoid/contents/code/msm.sh"
@@ -178,15 +179,14 @@ Rectangle {
                         }
                     }
                     onClicked: {
-                        var msmprogress = exec()
-                        var getcurrentprogress = msmprogress.split("\n")
-                        if(getcurrentprogress.indexOf("Cloning repository") != -1)
+                        var msmoutput = exec()
+                        if(msmoutput.indexOf("Installing from:") != -1)
                             {
                              installLabl.visible = false
                              msmSkillInstallProgBar.visible = true;
                              msmSkillInstallProgBar.indeterminate = true;
                             }
-                        if(getcurrentprogress.indexOf("Skill installed!") != -1)
+                        if(msmoutput.indexOf("Installed:") != -1)
                             {
                             msmSkillInstallProgBar.visible = false
                             installLabl.visible = true