Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
print("[*] Installation complete. Edit /var/artillery/config in order to config artillery to your liking")
#added to start after install.launches in seperate window
if is_windows():
os.chdir("src\windows")
os.chdir("src\\windows")
#copy over banlist
os.system("start cmd /K banlist.bat")
#Wait to make sure banlist is copied over
Expand Down Expand Up @@ -221,7 +221,7 @@
#remove program files
subprocess.call(['cmd', '/C', 'rmdir', '/S', '/Q', 'C:\\Program Files (x86)\\Artillery'])
#del uninstall cache
os.chdir("src\windows")
os.chdir("src\\windows")
os.system("start cmd /K del_cache.bat")
#just so they can see this message slleep a sec
print("[*] Artillery has been uninstalled.\n[*] Manually kill the process if it is still running.")
Expand Down
2 changes: 1 addition & 1 deletion src/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ def format_ips(url):
write_log(final_msg)
if is_posix():
write_log(
"Received URL Error trying to download feed from '%s', Reason: %s" (urls, format(err)),1)
"Received URL Error trying to download feed from '%s', Reason: %s" % (urls, format(err)),1)

try:
if is_windows():
Expand Down