installer

bin/komrade-app

@@ -4,12 +4,18 @@
 # Run the mobile app
 ##
 
-export KOMRADE_SHOW_LOG=0
 
-SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$SCRIPTPATH/komrade-activate"
-path=`realpath "$SCRIPTPATH/../komrade/app/main.py"`
-pathreqs=`realpath "$SCRIPTPATH/../requirements.txt"`
-python -m pip install -r "$pathreqs"
-python "$path" $*
+# funcs (mac doesnt have realpath)
+realpath() {
+    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
 
+path_conda="`realpath ~/komrade/lib/miniconda3`"
+path_venv="`realpath ~/komrade/code/venv`"
+path_repo="`realpath ~/komrade/code`"
+
+source $path_conda/etc/profile.d/conda.sh
+export PATH=\"$path_conda/bin:\$PATH\"
+conda activate $path_venv
+python -m pip install -r $path_repo/requirements.txt
+python $path_repo/komrade/app/main.py

bin/komrade-cli

@@ -1,18 +1,18 @@
 ##
 # Run the command line app
 ##
-export KOMRADE_SHOW_LOG=0
 
-SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+# funcs (mac doesnt have realpath)
+realpath() {
+    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
 
-path=`realpath "$SCRIPTPATH/../komrade/cli/cli.py"`
-pathvenv=`realpath "$SCRIPTPATH/../../venv/bin/activate"`
-source $pathvenv
+path_conda="`realpath ~/komrade/lib/miniconda3`"
+path_venv="`realpath ~/komrade/code/venv`"
+path_repo="`realpath ~/komrade/code`"
 
-python "$path" $*
-
-
-#if command -v deactivate &> /dev/null
-#then
-#    deactivate
-#fi
+source $path_conda/etc/profile.d/conda.sh
+export PATH="$path_conda/bin:$PATH"
+conda activate $path_venv
+python -m pip install -r $path_repo/requirements.txt
+python $path_repo/komrade/cli/cli.py

bin/komrade-op

@@ -2,21 +2,18 @@
 # Run THE OPERATOR
 ##
 
-# settings
-export KOMRADE_SHOW_LOG=1
+# funcs (mac doesnt have realpath)
+realpath() {
+    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
 
-# get virtualenv going
-SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-path=`realpath "$SCRIPTPATH/../komrade/backend/switchboard.py"`
-source "`which komrade-activate`"
-pathreqs=`realpath "$SCRIPTPATH/../requirements.txt"`
-python -m pip install -r "$pathreqs"
+path_conda="`realpath ~/komrade/lib/miniconda3`"
+path_venv="`realpath ~/komrade/code/venv`"
+path_repo="`realpath ~/komrade/code`"
 
-# run op forever
-cmd="python $path 8080 $*"
-while true; do $cmd && break; done
 
-#if command -v deactivate &> /dev/null
-#then
-#    deactivate
-#fi
+source $path_conda/etc/profile.d/conda.sh
+export PATH="$path_conda/bin:$PATH"
+conda activate $path_venv
+python -m pip install -r $path_repo/requirements.txt
+python $path_repo/komrade/backend/switchboard.py

script/install

@@ -56,7 +56,7 @@ then
     echo "created $path_lib"
 fi
 
-path_bin="$path_komrade/bin"
+path_bin="$path_komrade/code/bin"
 if [ ! -d "$path_bin" ]
 then
     mkdir -p $path_bin
@@ -294,31 +294,14 @@ echo '
 '
 
 commands_app="
-source $path_conda/etc/profile.d/conda.sh\n
-export PATH=\"$path_conda/bin:\$PATH\"\n
-conda activate $path_venv\n
-python -m pip install -r $path_repo/requirements.txt\n
-python $path_repo/komrade/app/main.py\n
+    source $path_conda/etc/profile.d/conda.sh\n
+    export PATH=\"$path_conda/bin:\$PATH\"\n
+    conda activate $path_venv\n
+    python -m pip install -r $path_repo/requirements.txt\n
+    python $path_repo/komrade/app/main.py\n
 "
 
 
-commands_cli="
-source $path_conda/etc/profile.d/conda.sh\n
-export PATH=\"$path_conda/bin:\$PATH\"\n
-conda activate $path_venv\n
-python -m pip install -r $path_repo/requirements.txt\n
-python $path_repo/komrade/cli/cli.py\n
-"
-
-
-commands_op="
-source $path_conda/etc/profile.d/conda.sh\n
-export PATH=\"$path_conda/bin:\$PATH\"\n
-conda activate $path_venv\n
-python -m pip install -r $path_repo/requirements.txt\n
-python $path_repo/komrade/backend/switchboard.py\n
-"
-
 
 export PATH="$path_bin:$PATH"
 bashline="export PATH=\"$path_bin:\$PATH\"     # komrade installation"
@@ -335,16 +318,7 @@ else
 fi
 
 
-echo -e $commands_app > $path_bin/komrade-app
-echo -e $commands_cli > $path_bin/komrade-cli
-echo -e $commands_op > $path_bin/komrade-op
-
-chmod +x $path_bin/komrade-app
-chmod +x $path_bin/komrade-cli
-chmod +x $path_bin/komrade-op
-
-
-echo "Now run Komrade with:
+echo -e "Now run Komrade with:
 
 komrade-app    [GUI interface -- alpha]
 
@@ -353,3 +327,13 @@ If that doesn't work, try running this series of comands:
 $commands_app
 
 "
+
+# run?
+. $path_bin/komrade-app
+
+if [ "$machine" = "Mac" ]
+then
+    cp "$path_bin/Komrade.app" /Applications/
+
+    echo "You may run the app by looking for 'Komrade.app' in your /Applications folder."
+fi