[ssuks] Make default operation 'write kickstart for current machine'

sailfishos · Jun 13, 2013 · 9fcbd9d · 9fcbd9d
1 parent 7b3694a
commit 9fcbd9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp
@@ -298,7 +298,8 @@ bool SsuKickstarter::write(QString kickstart){
   if (!opened) {
     qerr << "Unable to write output file " << ks.fileName() << ": " << ks.errorString() << endl;
     return false;
-  }
+  } else if (!ks.fileName().isEmpty())
+    qerr << "Writing kickstart to " << ks.fileName() << endl;
 
   QString displayName = QString("# DisplayName: %1 %2/%3 (%4) %5")
                                 .arg(repoOverride.value("brand"))

diff --git a/ssuks/ssuks.cpp b/ssuks/ssuks.cpp
@@ -28,13 +28,17 @@ void SsuKs::run(){
   QTextStream qerr(stderr);
   QHash<QString, QString> repoParameters;
 
+  if (arguments.count() == 1 && arguments.at(0) == "help"){
+    usage();
+    return;
+  }
+
   QString fileName;
   if (arguments.count() >= 1 && !arguments.at(0).contains("=")){
     fileName = arguments.at(0);
     arguments.removeFirst();
   }
 
-  if (arguments.count() >= 1){
   for (int i=0; i<arguments.count(); i++){
     if (arguments.at(i).count("=") != 1){
       qout << "Invalid flag: " << arguments.at(i) << endl;
@@ -74,8 +78,7 @@ void SsuKs::run(){
   kickstarter.setRepoParameters(repoParameters);
   QCoreApplication::exit(!kickstarter.write(fileName));
   return;
-  } else
-    usage();
+
 
   QCoreApplication::exit(0);
 }