minor update to bash script

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 token
-.DS_Store
+.DS_Store
+log

README.md

@@ -32,7 +32,8 @@ Download and install [Node.js](https://nodejs.org/en/)
 <summary><b>Mac/Linux Screen</b></summary>
 <br>
 <p>Screen allows the bot to run in the background without a terminal present</p>
-<p>Installing</p>
+<p><a href="https://linuxize.com/post/how-to-use-linux-screen/">Tutorial for usage</a>, check if it's installed already before installing</p>
+<p><b>Installing</b></p>
 <ul>
     <li>
         <p>Mac</p>
@@ -54,7 +55,8 @@ Download and install [Node.js](https://nodejs.org/en/)
 <summary><b>Mac/Linux Tmux</b></summary>
 <br>
 <p>Tmux allows the bot to run in the background without a terminal present</p>
-<p>Installing</p>
+<p><a href="https://linuxize.com/post/getting-started-with-tmux/">Tutorial for usage</a>, check if it's installed already before installing</p>
+<p><b>Installing</b></p>
 <ul>
     <li>
         <p>Mac</p>

dist/index.js

@@ -34,6 +34,7 @@ const api_1 = require("./api");
 const discord_1 = require("./discord");
 const queue_1 = require("./queue");
 const CLIENT = new discord_js_1.Client({ intents: [discord_js_1.Intents.FLAGS.GUILDS] });
+console.log(new Date().toISOString() + '\n\n');
 if (!fs.existsSync('./token')) {
     fs.writeFileSync('./token', '');
     console.error('Missing Discord Token, please enter the bot token into the token file');

package.json

@@ -1,43 +1,44 @@
 {
-  "name": "1800queue",
+    "name": "1800queue",
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "description": "",
+    "description": "",
-  "main": "dist/index.js",
+    "main": "dist/index.js",
-  "scripts": {
+    "scripts": {
-    "build": "tsc",
+        "build": "tsc",
-    "start": "node .",
+        "start": "node .",
-    "watch": "npm-watch",
+        "watch": "npm-watch",
-    "dev": "npm-watch"
+        "dev": "npm-watch",
-  },
+        "getname": "echo $npm_package_name"
-  "watch": {
-    "build": {
-      "patterns": [
-        "src"
-      ],
-      "extensions": "ts",
-      "legacyWatch": true
     },
-    "start": {
+    "watch": {
-      "patterns": [
+        "build": {
-        "dist"
+            "patterns": [
-      ],
+                "src"
-      "extensions": "js",
+            ],
-      "legacyWatch": true,
+            "extensions": "ts",
-      "runOnChangeOnly": true
+            "legacyWatch": true
+        },
+        "start": {
+            "patterns": [
+                "dist"
+            ],
+            "extensions": "js",
+            "legacyWatch": true,
+            "runOnChangeOnly": true
+        }
+    },
+    "author": "",
+    "license": "MIT",
+    "devDependencies": {
+        "@types/node": "^17.0.13",
+        "npm-watch": "^0.11.0",
+        "ts-node": "^10.4.0",
+        "typescript": "^4.5.5"
+    },
+    "dependencies": {
+        "@discordjs/rest": "^0.3.0",
+        "cheerio": "^1.0.0-rc.10",
+        "discord-api-types": "^0.26.1",
+        "discord.js": "^13.6.0"
     }
-  },
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^17.0.13",
-    "npm-watch": "^0.11.0",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.5"
-  },
-  "dependencies": {
-    "@discordjs/rest": "^0.3.0",
-    "cheerio": "^1.0.0-rc.10",
-    "discord-api-types": "^0.26.1",
-    "discord.js": "^13.6.0"
-  }
 }

scripts/mac-linux/install

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #change to ccurrent directory
 cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"

scripts/mac-linux/start

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#change to ccurrent directory
+#change to current directory
 cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
 cd ../..
 
@@ -27,14 +27,16 @@ echo $num > log/number
 #watchdog
 while true
 do
+
     #increment log file number
     num=$(( num + 1 ))
     echo $num > log/number
 
     #run
-    npm start >> log/$num.out 2> log/$num.err
+    npm start 2> log/$num.err | tee log/$num.out
 
     #give chance to close program
-    sleep 5
     printf "\n\n\n${C1}press ${C2}Control+C${C1} to close${NC}\n\n\n"
+    sleep 5
+
 done

scripts/mac-linux/start_screen

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#change to ccurrent directory
+cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
+
+#start
+if [[ $(screen -ls | grep $(npm run getname -s)) ]]; then
+    echo "Session already exists"
+else
+    screen -S $(npm run getname -s) -d -m ./start
+    echo "Created session"
+fi

scripts/mac-linux/start_tmux

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#change to ccurrent directory
+cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
+
+#start
+if [[ $(tmux ls | grep $(npm run getname -s)) ]]; then
+    echo "Session already exists"
+else
+    tmux new-session -d -s $(npm run getname -s) ./start
+    echo "Created session"
+fi

scripts/windows/install.bat

@@ -0,0 +1,7 @@
+@echo off
+
+@REM change to ccurrent directory
+cd %~f0\..\..\..\
+
+@REM run
+npm install

scripts/windows/start.bat

@@ -0,0 +1,29 @@
+@echo off
+
+@Rem change to current directory
+cd %~f0\..\..\..\
+
+@Rem make log folder
+if not exist log mkdir log
+
+@Rem current file number
+set /A num=0
+if exist log\number set /p num=<log\number
+
+echo %num > log\number
+
+@Rem watchdog
+:watchdog
+
+    @Rem increment log file number
+    set /A num=num+1
+    echo %num > log\number  
+
+    @Rem run
+    powershell "npm start 2> log\%num%.err | tee log\%num%.out"
+    
+
+    @Rem give chance to close program
+    timeout /t 5 /nobreak
+
+goto watchdog

src/index.ts

@@ -6,6 +6,8 @@ import { registerCommands } from './discord';
 import { createQueue, joinQueue, queueInfo } from './queue';
 const CLIENT = new Client({ intents: [Intents.FLAGS.GUILDS] });
 
+console.log(new Date().toISOString()+'\n\n');
+
 if (!fs.existsSync('./token')) {
     fs.writeFileSync('./token', '');
     console.error('Missing Discord Token, please enter the bot token into the token file');