Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix branded nemo and caja shell integration #5966

Merged
merged 3 commits into from
Aug 31, 2017
Merged

fix branded nemo and caja shell integration #5966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2609c8b
Update createcajaplugin.sh
jnweiger Aug 15, 2017
4848d2f
first apply branding, then create copies. Better.
Aug 15, 2017
8d22227
fix https://github.com/owncloud/ownbrander/issues/752 too.
Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell_integration/icons/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions shell_integration/nautilus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions shell_integration/nautilus/createcajaplugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions shell_integration/nautilus/createnemoplugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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