mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 04:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix branded nemo and caja shell integration (#5966)

Browse source 
* 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.
This commit is contained in:
Jürgen Weigert 2017-08-31 13:16:34 +02:00 committed by Roeland Jago Douma
parent 7280359c66
commit f96990b489
No known key found for this signature in database
GPG key ID: F941078878347C0C
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell_integration/icons/CMakeLists.txt
View file

@ -7,7 +7,7 @@ if( UNIX AND NOT APPLE )
FOREACH( file ${files} ) FOREACH( file ${files} )
# the GLOB returns a absolute path. Make it relative by replacing the current src dir by nothing # 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 "${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}) install(FILES ${file} DESTINATION ${ICON_DIR}/${size}/apps RENAME ${brandedName})
ENDFOREACH(file) ENDFOREACH(file)
ENDFOREACH(size) ENDFOREACH(size)

2
shell_integration/nautilus/CMakeLists.txt
View file

@ -3,8 +3,6 @@
if( UNIX AND NOT APPLE ) if( UNIX AND NOT APPLE )
configure_file(syncstate.py syncstate.py COPYONLY) 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. # Call the setupappname.sh script to set the custom app name.
set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh") set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh")

1
shell_integration/nautilus/createcajaplugin.sh
View file

@ -3,5 +3,6 @@
# this script creates a plugin for caja, just by replacing # 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).
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
sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py

1
shell_integration/nautilus/createnemoplugin.sh
View file

@ -3,4 +3,5 @@
# this script creates a plugin for nemo, just be replacing # this script creates a plugin for nemo, just be replacing
# all occurences of Nautilus with Nemo. # all occurences of Nautilus with Nemo.
cp syncstate.py syncstate_nemo.py
sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py