fix branded nemo and caja shell integration (#5966)

* Update createcajaplugin.sh

* first apply branding, then create copies. Better.
Fixes https://github.com/owncloud/ownbrander/issues/753

* fix https://github.com/owncloud/ownbrander/issues/752 too.

diff --git a/shell_integration/icons/CMakeLists.txt b/shell_integration/icons/CMakeLists.txt
index 5e2c958dff8969ce231a527a2c5b0d8a314671b2..04235c55b476a4f237ddac52698d2964367b4875 100644 (file)
--- a/shell_integration/icons/CMakeLists.txt
+++ b/shell_integration/icons/CMakeLists.txt
@@ -7,7 +7,7 @@ if( UNIX AND NOT APPLE )
        FOREACH( file ${files} )
            # the GLOB returns a absolute path. Make it relative by replacing the current src dir by nothing
            STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/${size}/" "" shortFile ${file})
-           STRING(REPLACE "oC" ${APPLICATION_NAME} brandedName ${shortFile})
+           STRING(REPLACE "oC" ${APPLICATION_SHORTNAME} brandedName ${shortFile})
            install(FILES ${file} DESTINATION ${ICON_DIR}/${size}/apps RENAME ${brandedName})
        ENDFOREACH(file)
     ENDFOREACH(size)

diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt
index 21f557d2f668021915157247fa67fb4bd44632b3..d8f75d8a57c40ed089d243bdc341169dba9d925b 100644 (file)
--- a/shell_integration/nautilus/CMakeLists.txt
+++ b/shell_integration/nautilus/CMakeLists.txt
@@ -3,8 +3,6 @@
 if( UNIX AND NOT APPLE )
 
     configure_file(syncstate.py syncstate.py COPYONLY)
-    configure_file(syncstate.py syncstate_nemo.py COPYONLY)
-    configure_file(syncstate.py syncstate_caja.py COPYONLY)
 
     # Call the setupappname.sh script to set the custom app name.
     set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh")

diff --git a/shell_integration/nautilus/createcajaplugin.sh b/shell_integration/nautilus/createcajaplugin.sh
index 860850d1a99877c1fa1879aef879f8cbbe79bbb6..8912d4a3f3920bebb3425fc69652cfbca06d0924 100755 (executable)
--- a/shell_integration/nautilus/createcajaplugin.sh
+++ b/shell_integration/nautilus/createcajaplugin.sh
@@ -3,5 +3,6 @@
 # this script creates a plugin for caja, just by replacing
 # all occurences of Nautilus with Caja (case sensitive).
 
+cp syncstate.py syncstate_caja.py
 sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py
 sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py

diff --git a/shell_integration/nautilus/createnemoplugin.sh b/shell_integration/nautilus/createnemoplugin.sh
index c6463b7ffd15b1e99b837dc4ad14af2862b2947c..0e08affc49f5bdb49326f4fe149b484c95412ac6 100755 (executable)
--- a/shell_integration/nautilus/createnemoplugin.sh
+++ b/shell_integration/nautilus/createnemoplugin.sh
@@ -3,4 +3,5 @@
 # this script creates a plugin for nemo, just be replacing
 # all occurences of Nautilus with Nemo.
 
+cp syncstate.py syncstate_nemo.py
 sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py