From 814a9b54fc32428446be9d87d2eae10cada45946 Mon Sep 17 00:00:00 2001
From: Dashie <dashie@sigpipe.me>
Date: Tue, 9 Aug 2022 09:33:56 +0200
Subject: [PATCH] Call python instead of python2
---
jslib/build.sh | 2 +-
server/scripts/collector.sh | 2 +-
server/scripts/remover.sh | 2 +-
server/scripts/stationremover.sh | 2 +-
server/scripts/wsserver.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jslib/build.sh b/jslib/build.sh
index bd7b57c..335d841 100755
--- a/jslib/build.sh
+++ b/jslib/build.sh
@@ -13,7 +13,7 @@ do
newFile="${file##*/}"
newFile="tmp/${newFile//.js/}.min.js"
echo "Processing $file -> $newFile"
- python2 -m jsmin $file > $newFile
+ python -m jsmin $file > $newFile
#cp $file $newFile
else
newFile="tmp/${file##*/}"
diff --git a/server/scripts/collector.sh b/server/scripts/collector.sh
index ded174e..50bd14d 100755
--- a/server/scripts/collector.sh
+++ b/server/scripts/collector.sh
@@ -17,6 +17,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect
cd $CURRENTDIR/..
- python2 ./bin/collector.py $CONFIGFILE $COLLECTORNUMBER
+ python $CURRENTDIR/../bin/collector.py $CONFIGFILE $COLLECTORNUMBER
exit 0
fi
diff --git a/server/scripts/remover.sh b/server/scripts/remover.sh
index ae45b6e..ccb0cae 100755
--- a/server/scripts/remover.sh
+++ b/server/scripts/remover.sh
@@ -16,6 +16,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect
cd $CURRENTDIR/..
- python2 $CURRENTDIR/../bin/remover.py $CONFIGFILE
+ python $CURRENTDIR/../bin/remover.py $CONFIGFILE
exit 0
fi
diff --git a/server/scripts/stationremover.sh b/server/scripts/stationremover.sh
index b116472..72be13e 100755
--- a/server/scripts/stationremover.sh
+++ b/server/scripts/stationremover.sh
@@ -17,6 +17,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect
cd $CURRENTDIR/..
- python2 $CURRENTDIR/../bin/stationremover.py $CONFIGFILE $STATIONID
+ python $CURRENTDIR/../bin/stationremover.py $CONFIGFILE $STATIONID
exit 0
fi
diff --git a/server/scripts/wsserver.sh b/server/scripts/wsserver.sh
index 2d357a6..999d3e7 100755
--- a/server/scripts/wsserver.sh
+++ b/server/scripts/wsserver.sh
@@ -15,6 +15,6 @@ else
export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect
cd $CURRENTDIR/..
- python2 $CURRENTDIR/../bin/wsserver.py --config $CONFIGFILE
+ python $CURRENTDIR/../bin/wsserver.py --config $CONFIGFILE
exit 0
fi
--
GitLab