[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] setup: Don't use the bat
From:       Hannah von Reth <vonreth () kde ! org>
Date:       2016-11-15 19:27:05
Message-ID: E1c6jNp-0001zF-S8 () code ! kde ! org
[Download RAW message or body]

Git commit c69493844fd32598f21b8c5a8e0d38d2e2539a8f by Hannah von Reth.
Committed on 15/11/2016 at 19:27.
Pushed by vonreth into branch 'master'.

Don't use the bat

M  +5    -5    setup/EmergeBootstrap.py

http://commits.kde.org/emerge/c69493844fd32598f21b8c5a8e0d38d2e2539a8f

diff --git a/setup/EmergeBootstrap.py b/setup/EmergeBootstrap.py
index ad258e7..a3d093e 100644
--- a/setup/EmergeBootstrap.py
+++ b/setup/EmergeBootstrap.py
@@ -76,9 +76,9 @@ class EmergeBootstrap(object):
         print()
         return os.path.exists(os.path.join( destdir, filename ))
 
-def run(args, command, cwd):
-    print("Execute: %s %s" % (os.path.join(args.root, "emerge", "kdeenv.bat"), \
                command))
-    subprocess.check_call("%s %s" % (os.path.join(args.root, "emerge", \
"kdeenv.bat"), command), shell=True, cwd=cwd) +def run(args, command):
+    print("Execute: %s %s" % (os.path.join(args.root, "emerge", "kdeenv.ps1"), \
command)) +    subprocess.check_call("%s %s" % (os.path.join(args.root, "emerge", \
"kdeenv.ps1"), command))  
 
 def setUp(args):
@@ -125,10 +125,10 @@ def setUp(args):
     if args.set:
         writeSettings(args)
 
-    run(args, "emerge git", args.root)
+    run(args, "emerge git")
     os.chdir(args.root)
     shutil.rmtree(os.path.join(args.root, "emerge"))
-    run(args, "git clone kde:emerge", args.root)
+    run(args, "git clone kde:emerge %s" % os.path.join(args.root, "emerge"))
     print("Setup complete")
     print("Please run %s/emerge/kdeenv.ps1" % args.root)
 


[prev in list] [next in list] [prev in thread] [next in thread]