Merge branch 'dev'

README.md

@@ -16,7 +16,7 @@ The release download includes a build of the NSS `certutil.exe`.
 Usage
 -------------
 - download and extract the ZIP file from the [release page](https://github.com/christian-korneck/firefox_add-certs/releases) (includes the NSS certutil.exe binaries)
-- put all CA certificates that you want to add in the folder: `cacert\`
+- put all CA certificates that you want to add in the folder: `cacert\`. File extension needs to be `.pem`.
   - note: For testing, the CA folder includes the [CACert.org](http://www.cacert.org/) root and intermediate certificates. Remove them if you don't want to add them.
 - run `add-certs.cmd` with admin privileges
 

add-certs.cmd

@@ -1,13 +1,13 @@
-@echo off
+@if /i "%1" NEQ "-verbose" @echo off
 setlocal
 
 REM #### general config
-if not defined programfiles(x86) set programfiles(x86)=%programfiles%
-set firefoxdefaultprofile=%programfiles(x86)%\Mozilla Firefox\browser\defaults\Profile
-
+set programFilesWithMozilla=%programfiles%
+if not exist "%programFilesWithMozilla%\Mozilla Firefox" set programFilesWithMozilla=%programfiles(x86)%
+if not exist "%programFilesWithMozilla%\Mozilla Firefox" exit /B 1
 
 REM #### default firefox profile
-if not exist "%programfiles(x86)%\Mozilla Firefox" exit /B 1
+set firefoxdefaultprofile=%programFilesWithMozilla%\Mozilla Firefox\browser\defaults\Profile
 if not exist "%firefoxdefaultprofile%" mkdir "%firefoxdefaultprofile%"
 if not exist "%firefoxdefaultprofile%\cert8.db" copy /y "%~dp0db\empty\cert8.db" "%firefoxdefaultprofile%\" >NUL
 if not exist "%firefoxdefaultprofile%\key3.db" copy /y "%~dp0db\empty\key3.db" "%firefoxdefaultprofile%\" >NUL
@@ -39,10 +39,13 @@ set certfile=!certpath:%replacepath%=!
 set certfile=!certfile:.pem=!
 set certfile=!certfile:.cacert=!
 set certfile=AddedByUser !certfile!
-FOR /D %%P IN ("%%U\AppData\Roaming\Mozilla\Firefox\Profiles\*") DO "%~dp0bin\certutil.exe" -A -n "!certfile!" -i "%%C" -t "cTC,cTC,cTC", -d "%%P"
+FOR /D %%P IN ("%%U\AppData\Roaming\Mozilla\Firefox\Profiles\*") DO (
+ "%~dp0bin\certutil.exe" -A -n "!certfile!" -i "%%C" -t "cTC,cTC,cTC", -d "%%P"
+)
 ))
 setlocal DISABLEDELAYEDEXPANSION
 
+REM ####Current user
 setlocal ENABLEDELAYEDEXPANSION
 set replacepath=%~dp0cacert\
 FOR /R "%~dp0" %%C IN (cacert\*.pem) DO (