From 54132425875723bba3bc740eea7c8d6a5e48910c Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 22 Apr 2015 10:00:56 +0800
Subject: [PATCH] minor cleanups

---
 conda/artiq/meta.yaml  | 2 +-
 conda/pydaqmx/bld.bat  | 2 +-
 conda/pydaqmx/build.sh | 2 +-
 setup.py               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 72c7bfb2d..d902460c1 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -19,8 +19,8 @@ build:
         - novatech409b_controller = artiq.frontend.novatech409b_controller:main
         - pdq2_client = artiq.frontend.pdq2_client:main
         - pdq2_controller = artiq.frontend.pdq2_controller:main
-        - thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
         - pxi6733_controller = artiq.frontend.pxi6733_controller:main
+        - thorlabs_tcube_controller = artiq.frontend.thorlabs_tcube_controller:main
         - artiq_gui = artiq.frontend.artiq_gui:main # [not win]
 
 requirements:
diff --git a/conda/pydaqmx/bld.bat b/conda/pydaqmx/bld.bat
index eb2a795fb..add2c3c60 100644
--- a/conda/pydaqmx/bld.bat
+++ b/conda/pydaqmx/bld.bat
@@ -1,2 +1,2 @@
 "%PYTHON%" setup.py build
-"%PYTHON%" setup.py install
\ No newline at end of file
+"%PYTHON%" setup.py install
diff --git a/conda/pydaqmx/build.sh b/conda/pydaqmx/build.sh
index 617c63d08..f1d91245e 100644
--- a/conda/pydaqmx/build.sh
+++ b/conda/pydaqmx/build.sh
@@ -1,2 +1,2 @@
 $PYTHON setup.py build
-$PYTHON setup.py install
\ No newline at end of file
+$PYTHON setup.py install
diff --git a/setup.py b/setup.py
index d37d9a237..f4737297d 100755
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,8 @@ scripts = [
     "novatech409b_controller=artiq.frontend.novatech409b_controller:main",
     "pdq2_client=artiq.frontend.pdq2_client:main",
     "pdq2_controller=artiq.frontend.pdq2_controller:main",
-    "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
     "pxi6733_controller=artiq.frontend.pxi6733_controller:main"
+    "thorlabs_tcube_controller=artiq.frontend.thorlabs_tcube_controller:main",
 ]
 
 if os.getenv("ARTIQ_GUI") == "1":