gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't exit if configDir doesn't exist, fix #19

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-04-11 21:14:15 +02:00
parent e7e31f72cc
commit 9ffaefed95
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -105,7 +105,10 @@ pretty-code:
get-roms: get-roms:
make -C dist/ROMs make -C dist/ROMs
install: all get-roms dist/config.lua: dist/x48ng
$^ --print-config > $@
install: all get-roms dist/config.lua
install -m 755 -d -- $(DESTDIR)$(PREFIX)/bin install -m 755 -d -- $(DESTDIR)$(PREFIX)/bin
install -c -m 755 dist/x48ng $(DESTDIR)$(PREFIX)/bin/x48ng install -c -m 755 dist/x48ng $(DESTDIR)$(PREFIX)/bin/x48ng
@ -124,7 +127,6 @@ install: all get-roms
install -m 755 -d -- $(DESTDIR)$(DOCDIR) install -m 755 -d -- $(DESTDIR)$(DOCDIR)
cp -R AUTHORS LICENSE README* doc* romdump/ $(DESTDIR)$(DOCDIR) cp -R AUTHORS LICENSE README* doc* romdump/ $(DESTDIR)$(DOCDIR)
dist/x48ng --print-config > dist/config.lua
install -c -m 644 dist/config.lua $(DESTDIR)$(DOCDIR)/config.lua install -c -m 644 dist/config.lua $(DESTDIR)$(DOCDIR)/config.lua
install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications

1
dist/config.lua vendored
View file

@ -28,6 +28,7 @@ fullscreen = false
mono = false mono = false
gray = false gray = false
leave_shift_keys = false leave_shift_keys = false
inhibit_shutdown = false
x11_visual = "default" x11_visual = "default"
netbook = false netbook = false

9
src/runtime_options.c
View file

@ -465,10 +465,8 @@ int parse_args_and_read_config( int argc, char* argv[] )
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
} }
if ( !normalize_config_dir() ) { if ( !normalize_config_dir() )
fprintf( stderr, "Configuration directory doesn't exist!\n" ); fprintf( stderr, "Configuration directory doesn't exist!\n" );
exit( 1 );
}
/**********************/ /**********************/
/* 1. read config.lua */ /* 1. read config.lua */
@ -652,10 +650,9 @@ int parse_args_and_read_config( int argc, char* argv[] )
/* After getting configs and params */ /* After getting configs and params */
/* normalize config_dir again in case it's been modified */ /* normalize config_dir again in case it's been modified */
if ( !normalize_config_dir() ) { if ( !normalize_config_dir() )
fprintf( stderr, "Configuration directory doesn't exist!\n" ); fprintf( stderr, "Configuration directory doesn't exist!\n" );
exit( 1 );
}
normalize_filenames(); normalize_filenames();
print_config |= verbose; print_config |= verbose;