Use variable for mods dir
This commit is contained in:
parent
31bf9b9dd7
commit
11bb2848c8
@ -151,7 +151,7 @@ function msgBaseExport(msgbase) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if the signature is good
|
// Check if the signature is good
|
||||||
result = system.exec('gpgv --keyring /opt/sbbs/mods/keys/pubring.kbx '+system.temp_dir+'videotex.gpg');
|
result = system.exec('gpgv --keyring '+system.mods_dir+'/keys/pubring.kbx '+system.temp_dir+'videotex.gpg');
|
||||||
|
|
||||||
if (result !== 0 ) {
|
if (result !== 0 ) {
|
||||||
log(LOG_ERROR,'! ERROR: Invalid Signature for message offset ['+i+'] in ['+msgbase.file+']');
|
log(LOG_ERROR,'! ERROR: Invalid Signature for message offset ['+i+'] in ['+msgbase.file+']');
|
||||||
@ -162,7 +162,7 @@ function msgBaseExport(msgbase) {
|
|||||||
file_remove(system.temp_dir+'videotex.tex')
|
file_remove(system.temp_dir+'videotex.tex')
|
||||||
|
|
||||||
// Check that the signature is allowed to author the frames
|
// Check that the signature is allowed to author the frames
|
||||||
result = system.exec('gpg --homedir /opt/sbbs/mods/keys --batch --status-fd 3 -o '+system.temp_dir+'videotex.tex '+system.temp_dir+'videotex.gpg 3>'+system.temp_dir+'videotex.log');
|
result = system.exec('gpg --homedir '+system.mods_dir+'/keys --batch --status-fd 3 -o '+system.temp_dir+'videotex.tex '+system.temp_dir+'videotex.gpg 3>'+system.temp_dir+'videotex.log');
|
||||||
|
|
||||||
if (result !== 0 ) {
|
if (result !== 0 ) {
|
||||||
log(LOG_ERROR,'! ERROR: Failed to extract message offset ['+i+'] in ['+msgbase.file+']');
|
log(LOG_ERROR,'! ERROR: Failed to extract message offset ['+i+'] in ['+msgbase.file+']');
|
||||||
|
@ -97,7 +97,7 @@ if (send == 1 && options.gpg_key) {
|
|||||||
if (file_exists(file+'.gpg'))
|
if (file_exists(file+'.gpg'))
|
||||||
file_remove(file+'.gpg')
|
file_remove(file+'.gpg')
|
||||||
|
|
||||||
result = system.exec('gpg --homedir /opt/sbbs/mods/keys --batch --local-user '+options.gpg_key+' -s '+file);
|
result = system.exec('gpg --homedir '+system.mods_dir+'/keys --batch --local-user '+options.gpg_key+' -s '+file);
|
||||||
w = new File(file+'.gpg');
|
w = new File(file+'.gpg');
|
||||||
|
|
||||||
if (w.open('r')) {
|
if (w.open('r')) {
|
||||||
|
Loading…
Reference in New Issue
Block a user