[education/rkward] rkward/plugins/rkwarddev_scripts: made generic git the new default, fixed ignored subfolder setting

[Thomas Friedrichsmeier]

Git commit f0b1cdea85f851c9ff2d5695f1523f42a4893cee by Thomas Friedrichsmeier, on behalf of m.eik michalke.
Committed on 06/05/2022 at 15:59.
Pushed by tfry into branch 'master'.

made generic git the new default, fixed ignored subfolder setting

M  +13   -10   rkward/plugins/rkwarddev_scripts/rkwarddev_rk.gitInstall_plugin_script.R

https://invent.kde.org/education/rkward/commit/f0b1cdea85f851c9ff2d5695f1523f42a4893cee

diff --git a/rkward/plugins/rkwarddev_scripts/rkwarddev_rk.gitInstall_plugin_script.R b/rkward/plugins/rkwarddev_scripts/rkwarddev_rk.gitInstall_plugin_script.R
index a87f7909..698b36cd 100644
--- a/rkward/plugins/rkwarddev_scripts/rkwarddev_rk.gitInstall_plugin_script.R
+++ b/rkward/plugins/rkwarddev_scripts/rkwarddev_rk.gitInstall_plugin_script.R
@@ -44,10 +44,10 @@ rk.set.comp("Install from git")
 
 packageSource <- rk.XML.dropdown("Package source",
   options=list(
-    "GitHub"=c(val="github", chk=TRUE),
+    "git (generic)"=c(val="git", chk=TRUE),
+    "GitHub"=c(val="github"),
     "GitLab"=c(val="gitlab"),
     "Bitbucket"=c(val="bitbucket"),
-    "git (generic)"=c(val="git"),
     "subversion (generic)"=c(val="svn")
   ),
   id.name="packageSource",
@@ -149,10 +149,10 @@ authFrameChecked <- rk.JS.vars(authFrame, modifiers="checked")
 
 JScalculate <- rk.paste.JS(
   authFrameChecked,
-  echo("\tinstall_", packageSource, "(\n"),
+  echo("  install_", packageSource, "(\n"),
   js(
     if(packageSource == "github" || packageSource == "gitlab" || packageSource == "bitbucket"){
-      echo("\t\trepo=\"", gitUser, "/", gitRepo)
+      echo("    repo=\"", gitUser, "/", gitRepo)
       if(gitSubdir){
         echo("/", gitSubdir)
       } else {}
@@ -163,25 +163,28 @@ JScalculate <- rk.paste.JS(
       if(authFrameChecked){
         if(packageSource == "github" || packageSource == "gitlab"){
           if(authToken){
-            echo(",\n\t\tauth_token=\"", authToken, "\"")
+            echo(",\n    auth_token=\"", authToken, "\"")
           } else {}
         } else if(packageSource == "bitbucket"){
           if(authUser){
-            echo(",\n\t\tauth_user=\"", authUser, "\"")
+            echo(",\n    auth_user=\"", authUser, "\"")
           } else {}
           if(authPassword){
-            echo(",\n\t\tpassword=\"", authPassword, "\"")
+            echo(",\n    password=\"", authPassword, "\"")
           } else {}
         } else {}
       } else {}
     } else if(packageSource == "git" || packageSource == "svn"){
-      echo("\t\turl=\"", fullURL, "\"")
+      echo("    url=\"", fullURL, "\"")
       if(gitReference){
-        echo(",\n\t\tbranch=\"", gitReference, "\"")
+        echo(",\n    branch=\"", gitReference, "\"")
+      } else {}
+      if(gitSubdir){
+        echo(",\n    subdir=\"", gitSubdir, "\"")
       } else {}
     } else {}
   ),
-  echo("\n\t)"),
+  echo("\n  )"),
   echo("\n")
 )