Skip to content
This repository has been archived by the owner on Feb 6, 2021. It is now read-only.

config path bugfix #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

config path bugfix #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
918bc32
config path bugfix
0x90 Feb 26, 2018
bc8c9bf
config path bugfix
0x90 Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ build
dist
smalisca.egg-info
**tmp**

# IDEA
.idea/

# PyEnv
.python-version
4 changes: 3 additions & 1 deletion smalisca/core/smalisca_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from __future__ import print_function, absolute_import, unicode_literals, division
import smalisca
import codecs
import os
import configparser
import json
from pyfiglet import Figlet
Expand All @@ -47,7 +48,8 @@
PROJECT_BANNER = PROJECT_NAME + " " + PROJECT_VERSION + "-" + PROJECT_DESC
PROJECT_URL = "http://nullsecurity.net, http://{blog,www}.dornea.nu"
PROJECT_MAIL = "info AEEET dornea DOT nu"
PROJECT_CONF = smalisca.get_file("data/config/config.conf")
PROJECT_CONF_PATH = os.path.join(os.path.dirname(__file__), "../data/config/config.conf")
PROJECT_CONF = smalisca.get_file(PROJECT_CONF_PATH)


# Common CLI arguments
Expand Down