#38 #40

xcodecraft · Dec 1, 2018 · 9c78a7a · 9c78a7a
1 parent 3545835
commit 9c78a7a
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 27 deletions.
diff --git a/setup/centos.sh b/setup/centos.sh
@@ -0,0 +1,7 @@
+DST=${HOME}/rigger-ng
+PKG=${HOME}/devspace/rigger-ng/src
+
+unlink $DST
+ln -s $PKG $DST
+cd $DST ;
+./setup.sh centos_xcc.py
diff --git a/setup/centos_team.sh b/setup/centos_team.sh
@@ -0,0 +1,8 @@
+DST=/usr/local/rigger-ng
+PKG=${HOME}/devspace/rigger-ng/src
+if test -d $DST 
+  sudo rm -rf $DST 
+fi
+sudo cp -r  $DST $PKG
+cd $DST ;
+./setup.sh centos.py
diff --git a/setup/mac.sh b/setup/mac.sh
@@ -1,14 +1,6 @@
 DST=${HOME}/rigger-ng
 PKG=${HOME}/devspace/rigger-ng/src
-
 unlink $DST
 ln -s $PKG $DST
-cd $DST ;
+cd $DST
 ./setup.sh mac.py
-cd /usr/local/bin
-sudo unlink rg
-sudo ln -s ${DST}/rg rg
-
-
-echo "Welcome use Rigger-NG! "
-echo "eg: rg help"
diff --git a/setup/simple.sh b/setup/simple.sh
diff --git a/setup/xcc_team.sh b/setup/xcc_team.sh
@@ -0,0 +1,8 @@
+DST=/data/x/tools/rigger-ng
+PKG=${HOME}/devspace/rigger-ng/src
+if test -d $DST 
+  sudo rm -rf $DST 
+fi
+sudo cp -r  $DST $PKG
+cd $DST ;
+./setup.sh xcc.py
diff --git a/src/core/run_env.py b/src/core/run_env.py
@@ -10,6 +10,7 @@ def load_rgenv():
 def set_modul_path() :
     root  = os.path.dirname(os.path.realpath(__file__))
     root  = os.path.dirname(root)
+    sys.path.append("/etc/rigger-ng")
     sys.path.append(root)
     sys.path.append(os.path.join(root,"extends/res") )
     sys.path.append(os.path.join(root,"lib") )

diff --git a/src/etc/rg_env.py b/src/etc/rg_env.py
diff --git a/src/etc/centos_mara.py → src/etc_tpl/centos_mara.py b/src/etc/centos_mara.py → src/etc_tpl/centos_mara.py
diff --git a/src/etc/mac.py → src/etc_tpl/mac.py b/src/etc/mac.py → src/etc_tpl/mac.py
diff --git a/src/etc/rgenv_tpl.py → src/etc_tpl/rgenv_tpl.py b/src/etc/rgenv_tpl.py → src/etc_tpl/rgenv_tpl.py
diff --git a/src/etc/ubuntu.py → src/etc_tpl/ubuntu.py b/src/etc/ubuntu.py → src/etc_tpl/ubuntu.py
diff --git a/src/etc/centos_xcc.py → src/etc_tpl/xcc.py b/src/etc/centos_xcc.py → src/etc_tpl/xcc.py
diff --git a/src/setup.sh b/src/setup.sh
@@ -10,14 +10,33 @@ if ! test -e "/usr/bin/python" ; then
     echo "rigger-ng need python"
     exit 0
 fi
-RGENV=`basename "$1"`
-cd $SHELL_DIR/etc
-if test -e $RGENV   ; then 
-    if test -L rg_env.py ; then 
-        rm rg_env.py
-    fi
-    ln -s $RGENV   rg_env.py
+ENV_TPL=`basename "$1"`
+ETC_DIR="/etc/rigger-ng"
+ETC_FILE="$ETC_DIR/rg_env.py"
+cd $SHELL_DIR/etc_tpl
+if test -f $ETC_FILE  ; then 
+  echo "$ETC_FILE exists! "
+else
+  if test -e $ENV_TPL   ; then 
+    sudo mkdir -p $ETC_DIR 
+    sudo cp $ENV_TPL  $ETC_FILE 
     echo "rigger-ng setup success!"
-else 
-    echo $RGENV not exists;
+  else 
+      echo $ENV_TPL not exists;
+      exit -1 ;
+  fi
+
 fi
+
+
+cd /usr/local/bin
+if test -L /usr/local/bin/rg ; then 
+  sudo rm /usr/local/bin/rg
+fi
+sudo ln -s ${DST}/rg rg
+
+echo ""
+echo "---------------------------------------"
+echo "Welcome use Rigger-NG! "
+echo "eg: rg help"
+echo "---------------------------------------"
diff --git a/test/main.py b/test/main.py
@@ -5,6 +5,7 @@ def setup_env() :
     root  = os.path.dirname(os.path.realpath(__file__))
     root  = os.path.dirname(root)
     sys.path.append(os.path.join(root,"src") )
+    sys.path.append("/etc/rigger-ng")
     import core.run_env
     core.run_env.set_modul_path()
     os.environ['PRJ_ROOT'] = root