script changes (#17)

* vscode / script changes

* fix launching from bin/

* merge .gitignore files

* use lowercase executable names

* add aur installation instructions

.gitignore

@@ -0,0 +1,4 @@
+/bin/SamRewritten
+/bin/samrewritten
+/glade/*.glade~
+/glade*.glade#

.vscode/launch.json

@@ -1,11 +1,11 @@
 {
-    // Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
-    // Pointez pour afficher la description des attributs existants.
-    // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "(gdb) Launch launcher",
+            "name": "(gdb) Launch SamRewritten",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/bin/samrewritten",
@@ -22,25 +22,6 @@
                     "ignoreFailures": true
                 }
             ]
-        },
-        {
-            "name": "(gdb) Launch samgame",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/bin/samgame",
-            "args": ["206690"],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/bin",
-            "environment": [{"name":"LD_LIBRARY_PATH","value":"${workspaceFolder}/bin"}],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
         }
     ]
 }

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "shell",
+            "command": "cd ${workspaceFolder} && ./make.sh",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

README.MD

@@ -37,7 +37,13 @@ To run it, launch ./bin/launch.sh
 
 Once again, all contributions are VERY welcome, even though this code is already aging and very badly written.
 
+# AUR Installation
+
+You can install SamRewritten by using an AUR and installing the `samrewritten-git` package
+
+Run SamRewritten by opening the corresponding desktop entry, or by using the `samrewritten` command.
+
 ### Footnotes
 
 This software comes with no warranty. Use it at your own risk. We believe you should not get any ban using it, but we do not take any responsability over 
-your user experience
+your user experience

bin/.gitignore

@@ -1,2 +0,0 @@
-/samgame
-/samrewritten

bin/launch.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
 
-SCRIPT=`realpath $0`
-SCRIPTPATH=`dirname $SCRIPT`
+SCRIPT_PATH=`dirname $(realpath $0)`
+export LD_LIBRARY_PATH=${SCRIPT_PATH}
 
-export LD_LIBRARY_PATH=$SCRIPTPATH
-echo "Library path is" $LD_LIBRARY_PATH
-cd $SCRIPTPATH
-cd ../
-$SCRIPTPATH/samrewritten $@
+cd ${SCRIPT_PATH}/..
+${SCRIPT_PATH}/samrewritten $@

glade/.gitignore

@@ -1,2 +0,0 @@
-*.glade~
-*.glade#

make.sh

@@ -1,17 +1,12 @@
 #!/bin/bash
 
-SCRIPT=`realpath $0`
-SCRIPTPATH=`dirname $SCRIPT`
-
-CPP_FILES=$(find src -type f -iname *.cpp -print)
+MAKE_PATH=$(dirname $(realpath $0))
+SRC_FILES=$(find ${MAKE_PATH}/src -type f -iname *.cpp -print)
 
 g++ -std=c++17 -g \
-`pkg-config --cflags gtk+-3.0` \
--rdynamic -export-dynamic -pthread -Wall \
-$CPP_FILES \
--L$SCRIPTPATH/bin \
--o $SCRIPTPATH/bin/samrewritten \
-`pkg-config --libs gtk+-3.0` \
--lpthread -lgmodule-2.0 -lsteam_api -lcurl -lyajl -ldl
+    $(pkg-config --cflags --libs gtk+-3.0) -rdynamic -export-dynamic -pthread -Wall -lpthread -lgmodule-2.0 -lsteam_api -lcurl -lyajl -ldl \
+    ${SRC_FILES} \
+    -L${MAKE_PATH}/bin \
+    -o ${MAKE_PATH}/bin/samrewritten \
 
-echo "If there wasn't any compilation error, you can launch the manager with ./bin/launch.sh"
+echo "If there weren't any compilation errors, you can launch SamRewritten with ./bin/launch.sh"