Rename SSU CLI from rndssu to ssu

sailfishos · Mar 27, 2013 · 10d9736 · 10d9736
1 parent 9c70589
commit 10d9736
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/buildpath.pri b/buildpath.pri
@@ -1,5 +1,9 @@
 isEmpty(BUILD){
-        BUILD = $$PWD/build/$$TARGET
+        isEmpty(TARGETDIR){
+                BUILD = $$PWD/build/$$TARGET
+        } else {
+                BUILD = $$PWD/build/$$TARGETDIR
+        }
 }
 isEmpty(DESTDIR){
         DESTDIR = $$BUILD

diff --git a/rndssucli/rndssucli.cpp b/rndssucli/rndssucli.cpp
@@ -130,6 +130,9 @@ void RndSsuCli::run(){
 
   QStringList arguments = QCoreApplication::arguments();
 
+  if (arguments.at(0).endsWith("rndssu"))
+    qout << "NOTE: this binary is now called ssu. The rndssu symlink will go away after some time" << endl;
+
   // make sure there's a first argument to parse
   if (arguments.count() < 2){
     usage();

diff --git a/rndssucli/rndssucli.pro b/rndssucli/rndssucli.pro
@@ -3,7 +3,8 @@ SOURCES = main.cpp \
         rndssucli.cpp
 #RESOURCES = rndregister.qrc
 TEMPLATE = app
-TARGET = rndssu
+TARGET = ssu
+TARGETDIR = ssucli
 LIBS += -lssu
 CONFIG -= app_bundle
 CONFIG += console

diff --git a/rpm/ssu.spec b/rpm/ssu.spec
@@ -22,6 +22,7 @@ Requires: ssu-vendor-data
 %defattr(-,root,root,-)
 %{_libdir}/zypp/plugins/urlresolver/*
 %{_bindir}/rndssu
+%{_bindir}/ssu
 %{_libdir}/*.so.*
 %dir %{_sysconfdir}/zypp/credentials.d
 
@@ -104,6 +105,7 @@ make %{?_smp_mflags}
 %install
 make INSTALL_ROOT=%{buildroot} install
 mkdir -p %{buildroot}/%{_sysconfdir}/zypp/credentials.d
+ln -s %{_bindir}/ssu %{buildroot}/%{_bindir}/rndssu
 
 %pre
 groupadd -rf ssu