netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-11-11 22:51:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix darwin detection

Browse source
This commit is contained in:
Orsiris de Jong 2023-06-11 15:02:48 +02:00
parent d1ada6d8d4
commit e09643cf0f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/compile.py
View file

@ -7,7 +7,7 @@ __intname__ = "npbackup.compile"
__author__ = "Orsiris de Jong" __author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2023 NetInvent" __copyright__ = "Copyright (C) 2023 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2023033001" __build__ = "2023061101"
__version__ = "1.8.3" __version__ = "1.8.3"
@ -178,6 +178,10 @@ def compile(arch, audience, no_gui=False):
program_executable = "npbackup.exe" program_executable = "npbackup.exe"
restic_executable = "restic.exe" restic_executable = "restic.exe"
platform = "windows" platform = "windows"
elif sys.platform.lower() == "darwin":
platform = "darwin"
program_executable = "npbackup"
restic_executable = "restic"
else: else:
program_executable = "npbackup" program_executable = "npbackup"
restic_executable = "restic" restic_executable = "restic"

5
npbackup/core/restic_source_binary.py
View file

@ -7,10 +7,11 @@ __intname__ = "npbackup.gui.core.restic_source_binary"
__author__ = "Orsiris de Jong" __author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2022-2023 NetInvent" __copyright__ = "Copyright (C) 2022-2023 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2023061101" __build__ = "2023061102"
import os import os
import sys
import glob import glob
from npbackup.path_helper import BASEDIR from npbackup.path_helper import BASEDIR
@ -26,7 +27,7 @@ def get_restic_internal_binary(arch):
binary = "restic_*_windows_amd64.exe" binary = "restic_*_windows_amd64.exe"
else: else:
binary = "restic_*_windows_386.exe" binary = "restic_*_windows_386.exe"
elif os.name == "darwin": elif sys.platform.lower() == "darwin":
if arch == "arm64": if arch == "arm64":
binary = "restic_*_darwin_arm64" binary = "restic_*_darwin_arm64"
else: else: