From 2609c8bd9fd3f69d24f7903360d711c2e4c66e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Tue, 15 Aug 2017 21:14:58 +0200 Subject: [PATCH 1/3] Update createcajaplugin.sh --- shell_integration/nautilus/createcajaplugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/nautilus/createcajaplugin.sh b/shell_integration/nautilus/createcajaplugin.sh index 860850d1a99..7f13d0a3a98 100755 --- a/shell_integration/nautilus/createcajaplugin.sh +++ b/shell_integration/nautilus/createcajaplugin.sh @@ -1,7 +1,7 @@ #!/bin/sh # this script creates a plugin for caja, just by replacing -# all occurences of Nautilus with Caja (case sensitive). +# all occurences of Nautilus with Caja (case sensitive).X sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py From 4848d2f15a919e7cbe8f871be039b404ac89cdda Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Tue, 15 Aug 2017 21:22:23 +0200 Subject: [PATCH 2/3] first apply branding, then create copies. Better. Fixes https://github.com/owncloud/ownbrander/issues/753 --- shell_integration/nautilus/CMakeLists.txt | 2 -- shell_integration/nautilus/createcajaplugin.sh | 3 ++- shell_integration/nautilus/createnemoplugin.sh | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt index 21f557d2f66..d8f75d8a57c 100644 --- 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 7f13d0a3a98..8912d4a3f39 100755 --- a/shell_integration/nautilus/createcajaplugin.sh +++ b/shell_integration/nautilus/createcajaplugin.sh @@ -1,7 +1,8 @@ #!/bin/sh # this script creates a plugin for caja, just by replacing -# all occurences of Nautilus with Caja (case sensitive).X +# 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 c6463b7ffd1..0e08affc49f 100755 --- 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 From 8d22227913b1d7617b8de1d6c1e5b2d9e75e7bd9 Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Tue, 15 Aug 2017 21:49:16 +0200 Subject: [PATCH 3/3] fix https://github.com/owncloud/ownbrander/issues/752 too. --- shell_integration/icons/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/icons/CMakeLists.txt b/shell_integration/icons/CMakeLists.txt index 5e2c958dff8..04235c55b47 100644 --- 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)