Anaconda asset to modules migration

zefiros-software · Aug 13, 2016 · 309942e · 309942e
1 parent 4fc7727
commit 309942e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.package.json b/.package.json
@@ -27,10 +27,6 @@
             "Zefiros-Software/Zefiros-Defaults"
         ],
         "assets": [
-            {
-                "name": "Zefiros-Software/Anaconda",
-                "version": "@head"
-            },
             {
                 "name": "Zefiros-Software/Zefiros-Mkdocs-Style",
                 "version": "^1.0.0"
@@ -47,6 +43,9 @@
         "Profiler": true,
         "OwnArmadillo": true
     },  
+    "modules": [
+        "Zefiros-Software/Anaconda"
+    ],
     "requires": [
         {
             "name": "Zefiros-Software/ArmadilloExt",

diff --git a/install/bsplib-dev.lua b/install/bsplib-dev.lua
@@ -22,18 +22,10 @@
 -- @endcond
 --]]
 
-dofile( "assets/Zefiros-Software/BSPLib/Zefiros-Software/Anaconda/anaconda.lua" )
+local ana = require( "Zefiros-Software/Anaconda", "@head" )
 
-local anaBin = os.get() == "windows" and os.getenv("UserProfile") .. "/zpm-anaconda/Scripts/" or "~/zpm-anaconda/bin/"
-
-if os.get() == "windows" then
-    os.executef( "%spip install mkdocs -U", anaBin )
-    os.executef( "%spip install mkdocs-bootswatch -U", anaBin )
-    os.executef( "%spip install pymdown-extensions -U", anaBin )
-    os.executef( "%spip install markdown-checklist -U", anaBin )
-else
-    os.executef( "%s/python3 %spip install mkdocs -U", anaBin, anaBin )
-    os.executef( "%s/python3 %spip install mkdocs-bootswatch -U", anaBin, anaBin )
-    os.executef( "%s/python3 %spip install pymdown-extensions -U", anaBin, anaBin )
-    os.executef( "%s/python3 %spip install markdown-checklist -U", anaBin, anaBin )
-end
+ana.install()
+ana.pip( "install mkdocs -U" )
+ana.pip( "install mkdocs-bootswatch -U" )
+ana.pip( "install pymdown-extensions -U" )
+ana.pip( "install markdown-checklist -U" )