This commit is contained in:
Bert van der Weerd 2021-06-10 15:27:33 +02:00
parent f80ce7a583
commit a7326a0680
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1

View file

@ -23,7 +23,7 @@ options, remainder = parser.parse_args()
def beep(): def beep():
print('\a') print('\a', end='')
def enter_srcdir(): def enter_srcdir():
dir = "firefox-{}".format(pkgver) dir = "firefox-{}".format(pkgver)
@ -45,7 +45,7 @@ def leave_srcdir():
os.chdir("..") os.chdir("..")
def exec(cmd): def exec(cmd):
print("{}".format(cmd)) print(cmd)
if not options.no_execute: if not options.no_execute:
retval = os.system(cmd) retval = os.system(cmd)
if retval != 0: if retval != 0:
@ -73,7 +73,7 @@ def execute_git_init():
exec("git config core.safecrlf false") exec("git config core.safecrlf false")
exec("git config commit.gpgsign false") exec("git config commit.gpgsign false")
exec("git add -f * .[a-z]*") exec("git add -f * .[a-z]*")
exec("git commit -am 'Initial commit'") exec("git commit -am initial")
leave_srcdir() leave_srcdir()
@ -106,9 +106,13 @@ def execute_mach_env():
def execute_reset(): def execute_reset():
if options.src == 'release': if options.src == 'release':
print("error: cannot reset -release source as it's not under version control") path = "firefox-{}/.git/index".format(pkgver)
beep() if not os.path.isfile(path):
print("fatal error: cannot reset '--src release' sources as it's not under version control.")
sys.exit(1) sys.exit(1)
enter_srcdir()
exec("git reset --hard")
leave_srcdir()
elif options.src == 'nightly': elif options.src == 'nightly':
enter_srcdir() enter_srcdir()
exec("hg up -C") exec("hg up -C")
@ -320,7 +324,7 @@ help_message = """# Use:
clean - clean everything, including extracted/fetched sources clean - clean everything, including extracted/fetched sources
fetch - wget or hg clone or git pull fetch - wget or hg clone or git pull
extract - nop if not wget extract - when using wget, extract the archive.
lw_do_patches - [librewolf] patch the source lw_do_patches - [librewolf] patch the source
build - build the browser build - build the browser
lw_post_build - [librewolf] insert our settings lw_post_build - [librewolf] insert our settings