tools: fix cli args parsing

No need to "shift" if argument does not expect parameter on the command line.