From 4e137ab35e549bf9eaf79bce0c7e9fcd1005f67c Mon Sep 17 00:00:00 2001 From: zawwz Date: Wed, 6 Jan 2021 10:07:04 +0100 Subject: [PATCH] Fix generate bug on empty commands --- src/generate.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/generate.cpp b/src/generate.cpp index ee135ee..3355b91 100644 --- a/src/generate.cpp +++ b/src/generate.cpp @@ -316,18 +316,21 @@ std::string cmd::generate(int ind) for(auto it: var_assigns) ret += it.first + '=' + it.second->generate(ind) + ' '; - if(args==nullptr || args->size()<=0) + if(args!=nullptr && args->size()>0) { - ret.pop_back(); + // command + ret += args->generate(ind); + // delete potential trailing space + if(ret[ret.size()-1] == ' ') + ret.pop_back(); + } + else if(opt_minimize) // minimize: empty command: don't put redirects + { + if(ret.size()>0) + ret.pop_back(); return ret; } - // command - ret += args->generate(ind); - // delete potential trailing space - if(ret[ret.size()-1] == ' ') - ret.pop_back(); - ret += generate_redirs(ind, ret); return ret; }