Merge branch 'piper/absolute-paths' into 'main'

Use absolute paths where possible

See merge request whom/bingobot!15

internal/config/config.go

@@ -2,6 +2,8 @@ package config
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 
 	"github.com/spf13/viper"
 )
@@ -36,16 +38,29 @@ type AppConfig struct {
 }
 
 var config *AppConfig
+var workingDir string
 
 func init() {
 	setDefaults()
 	viper.Unmarshal(&config)
+
+	ex, err := os.Executable()
+
+	if err != nil {
+		panic(fmt.Errorf("failed to get path of executable (self): %v", err))
+	}
+
+	workingDir = filepath.Dir(ex)
 }
 
 func Get() *AppConfig {
 	return config
 }
 
+func GetWorkingDir() string {
+	return workingDir
+}
+
 func GetDefaultConfig() *AppConfig {
 	var config *AppConfig
 	setDefaults()
@@ -62,7 +77,7 @@ func Init() error {
 
 	viper.SetConfigName("config")
 	viper.SetConfigType("yaml")
-	viper.AddConfigPath(".")
+	viper.AddConfigPath(workingDir)
 
 	err := viper.ReadInConfig()
 	if err != nil {

internal/logging/logging.go

@@ -20,7 +20,7 @@ func Init() {
 	cfg := config.Get()
 
 	lj := &lumberjack.Logger{
-		Filename:   filepath.Join(cfg.LogDir, cfg.LogFile),
+		Filename:   filepath.Join(config.GetWorkingDir(), cfg.LogDir, cfg.LogFile),
 		MaxSize:    cfg.LogMaxSizeMB,
 		MaxBackups: cfg.LogMaxBackups,
 		MaxAge:     cfg.LogMaxAgeDays,

start.sh

@@ -1,10 +1,13 @@
+PROJECT_ROOT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+TOKEN_FILE="${PROJECT_ROOT}/bot.token"
+
 APP_ID=1303795224857804851
 
-if [ ! -f "bot.token" ]; then
+if [ ! -f "${TOKEN_FILE}" ]; then
     echo "can't startup: bot.token file missing"
     exit 2
 fi
 
-BOT_TOKEN=$(cat bot.token)
+BOT_TOKEN=$(cat ${TOKEN_FILE})
 
-./bingobot --token ${BOT_TOKEN}
+${PROJECT_ROOT}/bingobot --token ${BOT_TOKEN}