Attachment #228122 for bug #258680

View | Details | Raw Unified | Return to bug 258680
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/x11-themes/canta-gtk-themes/Makefile (-1 / +2 lines)
1	# Created by: Alexander Vereeken <Alexander88207@protonmail.com>	1	# Created by: Alexander Vereeken <Alexander88207@protonmail.com>
2		2
3	PORTNAME= canta-gtk-themes	3	PORTNAME= canta-gtk-themes
4	DISTVERSION= 2021-07-06	4	DISTVERSION= 2021-09-08
5	CATEGORIES= x11-themes	5	CATEGORIES= x11-themes
6		6
7	MAINTAINER= Alexander88207@protonmail.com	7	MAINTAINER= Alexander88207@protonmail.com
Lines 11-16 LICENSE= GPLv3 Link Here
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	BUILD_DEPENDS= bash>0:shells/bash \	13	BUILD_DEPENDS= bash>0:shells/bash \
		14	gsed:textproc/gsed \
14	sassc>0:textproc/sassc	15	sassc>0:textproc/sassc
15	RUN_DEPENDS= gtk-engines2>0:x11-themes/gtk-engines2 \	16	RUN_DEPENDS= gtk-engines2>0:x11-themes/gtk-engines2 \
16	gtk-murrine-engine>0:x11-themes/gtk-murrine-engine	17	gtk-murrine-engine>0:x11-themes/gtk-murrine-engine

Lines 1-3 Link Here

(-)b/x11-themes/canta-gtk-themes/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1627066042	1	TIMESTAMP = 1632326840
2	SHA256 (vinceliuice-Canta-theme-2021-07-06_GH0.tar.gz) = 364f531dc3a346c0aabde57518e3b66c6ae1535d1e919489732ebb2cabfae419	2	SHA256 (vinceliuice-Canta-theme-2021-09-08_GH0.tar.gz) = 98f6b71fbc46b1b9e1b256588cf930f780952f95c57f48c9922065c8b333bacd
3	SIZE (vinceliuice-Canta-theme-2021-07-06_GH0.tar.gz) = 5006531	3	SIZE (vinceliuice-Canta-theme-2021-09-08_GH0.tar.gz) = 4992868




--- install.sh.orig	2021-09-22 16:18:31 UTC
+++ install.sh
@@ -403,13 +403,13 @@ theme_colors() {
         theme_color='indigo'
         ;;
     esac
-    sed -i "/\$color:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
+    gsed -i "/\$color:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
+  cp -pr ${SRC_DIR}/COPYING                                                          ${THEME_DIR}
+  cp -pr ${SRC_DIR}/AUTHORS                                                          ${THEME_DIR}
 
   echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme
   echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme
@@ -99,10 +99,10 @@ install() {
   echo "ButtonLayout=menu:minimize,maximize,close" >> ${THEME_DIR}/index.theme
 
   mkdir -p                                                                           ${THEME_DIR}/gnome-shell
-  cp -ur ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
-  cp -ur ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml                  ${THEME_DIR}/gnome-shell
-  cp -ur ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK}                               ${THEME_DIR}/gnome-shell/assets
-  cp -ur ${SRC_DIR}/src/gnome-shell/common-assets/*.svg                              ${THEME_DIR}/gnome-shell/assets
+  cp -pr ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
+  cp -pr ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml                  ${THEME_DIR}/gnome-shell
+  cp -pr ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK}                               ${THEME_DIR}/gnome-shell/assets
+  cp -pr ${SRC_DIR}/src/gnome-shell/common-assets/*.svg                              ${THEME_DIR}/gnome-shell/assets
 
   if [[ "${theme}" != '' ]]; then
   if [[ "${GS_VERSION:-}" == 'new' ]]; then
@@ -112,76 +112,76 @@ install() {
   fi
   else
   if [[ "${GS_VERSION:-}" == 'new' ]]; then
-    cp -ur ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
+    cp -pr ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
   else
-    cp -ur ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
+    cp -pr ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css      ${THEME_DIR}/gnome-shell/gnome-shell.css
   fi
   fi
 
   mkdir -p                                                                           ${THEME_DIR}/gtk-2.0
-  cp -ur ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc}                          ${THEME_DIR}/gtk-2.0
-  cp -ur ${SRC_DIR}/src/gtk-2.0/main.rc${theme}                                      ${THEME_DIR}/gtk-2.0/main.rc
-  cp -ur ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK}                                   ${THEME_DIR}/gtk-2.0/assets
+  cp -pr ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc}                          ${THEME_DIR}/gtk-2.0
+  cp -pr ${SRC_DIR}/src/gtk-2.0/main.rc${theme}                                      ${THEME_DIR}/gtk-2.0/main.rc
+  cp -pr ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK}                                   ${THEME_DIR}/gtk-2.0/assets
   [[ ${theme} != '' && ${color} == '-dark' ]] && \
-  cp -ur ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png                              ${THEME_DIR}/gtk-2.0/assets
-  cp -ur ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color}                                ${THEME_DIR}/gtk-2.0/gtkrc
+  cp -pr ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png                              ${THEME_DIR}/gtk-2.0/assets
+  cp -pr ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color}                                ${THEME_DIR}/gtk-2.0/gtkrc
 
   mkdir -p                                                                           ${THEME_DIR}/gtk-3.0
-  cp -ur ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-3.0
-  cp -ur ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-3.0
+  cp -pr ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-3.0
+  cp -pr ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-3.0
 
   if [[ "${theme}" != '' ]]; then
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.scss                  ${THEME_DIR}/gtk-3.0/gtk.css
     [[ ${color} != '-dark' ]] && \
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.scss                     ${THEME_DIR}/gtk-3.0/gtk-dark.css
   else
-    cp -ur ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-3.0/gtk.css
+    cp -pr ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-3.0/gtk.css
     [[ ${color} != '-dark' ]] && \
-    cp -ur ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-3.0/gtk-dark.css
+    cp -pr ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-3.0/gtk-dark.css
   fi
 
   mkdir -p                                                                           ${THEME_DIR}/gtk-4.0
-  cp -ur ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-4.0
-  cp -ur ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-4.0
+  cp -pr ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-4.0
+  cp -pr ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-4.0
 
   if [[ "${theme}" != '' ]]; then
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.scss                  ${THEME_DIR}/gtk-4.0/gtk.css
     [[ ${color} != '-dark' ]] && \
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.scss                     ${THEME_DIR}/gtk-4.0/gtk-dark.css
   else
-    cp -ur ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-4.0/gtk.css
+    cp -pr ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-4.0/gtk.css
     [[ ${color} != '-dark' ]] && \
-    cp -ur ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-4.0/gtk-dark.css
+    cp -pr ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-4.0/gtk-dark.css
   fi
 
   mkdir -p                                                                           ${THEME_DIR}/metacity-1
-  cp -ur ${SRC_DIR}/src/metacity-1/assets/*.png                                      ${THEME_DIR}/metacity-1
-  cp -ur ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml                      ${THEME_DIR}/metacity-1/metacity-theme-1.xml
+  cp -pr ${SRC_DIR}/src/metacity-1/assets/*.png                                      ${THEME_DIR}/metacity-1
+  cp -pr ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml                      ${THEME_DIR}/metacity-1/metacity-theme-1.xml
   cd ${THEME_DIR}/metacity-1
   ln -s metacity-theme-1.xml metacity-theme-2.xml
   ln -s metacity-theme-1.xml metacity-theme-3.xml
 
   mkdir -p                                                                           ${THEME_DIR}/unity
-  cp -ur ${SRC_DIR}/src/unity/{*.svg,*.png,dash-widgets.json}                        ${THEME_DIR}/unity
-  cp -ur ${SRC_DIR}/src/unity/assets${ELSE_LIGHT}                                    ${THEME_DIR}/unity/assets
+  cp -pr ${SRC_DIR}/src/unity/{*.svg,*.png,dash-widgets.json}                        ${THEME_DIR}/unity
+  cp -pr ${SRC_DIR}/src/unity/assets${ELSE_LIGHT}                                    ${THEME_DIR}/unity/assets
 
   mkdir -p                                                                           ${THEME_DIR}/xfwm4
-  cp -ur ${SRC_DIR}/src/xfwm4/{*.svg,themerc}                                        ${THEME_DIR}/xfwm4
-  cp -ur ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT}                                    ${THEME_DIR}/xfwm4/assets
+  cp -pr ${SRC_DIR}/src/xfwm4/{*.svg,themerc}                                        ${THEME_DIR}/xfwm4
+  cp -pr ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT}                                    ${THEME_DIR}/xfwm4/assets
 
   if [[ "${theme}" == '' ]]; then
   mkdir -p                                                                           ${THEME_DIR}/cinnamon
-  cp -ur ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css                            ${THEME_DIR}/cinnamon/cinnamon.css
-  cp -ur ${SRC_DIR}/src/cinnamon/assets/common-assets                                ${THEME_DIR}/cinnamon/assets
-  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg            ${THEME_DIR}/cinnamon/assets/checkbox
-  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg                ${THEME_DIR}/cinnamon/assets/menu
-  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg                ${THEME_DIR}/cinnamon/assets/misc
-  cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg              ${THEME_DIR}/cinnamon/assets/switch
-  cp -ur ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png                           ${THEME_DIR}/cinnamon/thumbnail.png
+  cp -pr ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css                            ${THEME_DIR}/cinnamon/cinnamon.css
+  cp -pr ${SRC_DIR}/src/cinnamon/assets/common-assets                                ${THEME_DIR}/cinnamon/assets
+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg            ${THEME_DIR}/cinnamon/assets/checkbox
+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg                ${THEME_DIR}/cinnamon/assets/menu
+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg                ${THEME_DIR}/cinnamon/assets/misc
+  cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg              ${THEME_DIR}/cinnamon/assets/switch
+  cp -pr ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png                           ${THEME_DIR}/cinnamon/thumbnail.png
   fi
 
   mkdir -p                                                                           ${THEME_DIR}/plank
-  cp -ur ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme                                ${THEME_DIR}/plank/dock.theme
+  cp -pr ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme                                ${THEME_DIR}/plank/dock.theme
 }
 
 bakground_image() {
     echo "Install with no nautilus bakground image..."
-    sed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
+    gsed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
 }
-  cp -ur ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
+  cp -pr ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
 
 theme_tweaks() {
   gtk-update-icon-cache ${ICON_DEST_DIR}/Canta

Return to bug 258680

Lines 1-143 Link Here

(-)b/x11-themes/canta-gtk-themes/files/patch-install.sh (-138 / +13 lines)
1	--- install.sh.orig 2021-07-23 18:55:57 UTC	1	--- install.sh.orig 2021-09-22 16:18:31 UTC
2	+++ install.sh	2	+++ install.sh
3	@@ -82,8 +82,8 @@ install() {	3	@@ -403,13 +403,13 @@ theme_colors() {
4	echo "Installing '${THEME_DIR}'..."	4	theme_color='indigo'
5		5	;;
6	mkdir -p ${THEME_DIR}	6	esac
7	- cp -ur ${SRC_DIR}/COPYING ${THEME_DIR}	7	- sed -i "/\$color:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
8	- cp -ur ${SRC_DIR}/AUTHORS ${THEME_DIR}	8	+ gsed -i "/\$color:/s/default/${theme_color}/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
9	+ cp -pr ${SRC_DIR}/COPYING ${THEME_DIR}
10	+ cp -pr ${SRC_DIR}/AUTHORS ${THEME_DIR}
11
12	echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme
13	echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme
14	@@ -99,10 +99,10 @@ install() {
15	echo "ButtonLayout=menu:minimize,maximize,close" >> ${THEME_DIR}/index.theme
16
17	mkdir -p ${THEME_DIR}/gnome-shell
18	- cp -ur ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
19	- cp -ur ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml ${THEME_DIR}/gnome-shell
20	- cp -ur ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK} ${THEME_DIR}/gnome-shell/assets
21	- cp -ur ${SRC_DIR}/src/gnome-shell/common-assets/*.svg ${THEME_DIR}/gnome-shell/assets
22	+ cp -pr ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
23	+ cp -pr ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml ${THEME_DIR}/gnome-shell
24	+ cp -pr ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK} ${THEME_DIR}/gnome-shell/assets
25	+ cp -pr ${SRC_DIR}/src/gnome-shell/common-assets/*.svg ${THEME_DIR}/gnome-shell/assets
26
27	if [[ "${theme}" != '' ]]; then
28	if [[ "${GS_VERSION:-}" == 'new' ]]; then
29	@@ -112,76 +112,76 @@ install() {
30	fi
31	else
32	if [[ "${GS_VERSION:-}" == 'new' ]]; then
33	- cp -ur ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
34	+ cp -pr ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
35	else
36	- cp -ur ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
37	+ cp -pr ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css ${THEME_DIR}/gnome-shell/gnome-shell.css
38	fi
39	fi	9	fi
40
41	mkdir -p ${THEME_DIR}/gtk-2.0
42	- cp -ur ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc} ${THEME_DIR}/gtk-2.0
43	- cp -ur ${SRC_DIR}/src/gtk-2.0/main.rc${theme} ${THEME_DIR}/gtk-2.0/main.rc
44	- cp -ur ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK} ${THEME_DIR}/gtk-2.0/assets
45	+ cp -pr ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc} ${THEME_DIR}/gtk-2.0
46	+ cp -pr ${SRC_DIR}/src/gtk-2.0/main.rc${theme} ${THEME_DIR}/gtk-2.0/main.rc
47	+ cp -pr ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK} ${THEME_DIR}/gtk-2.0/assets
48	[[ ${theme} != '' && ${color} == '-dark' ]] && \
49	- cp -ur ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png ${THEME_DIR}/gtk-2.0/assets
50	- cp -ur ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color} ${THEME_DIR}/gtk-2.0/gtkrc
51	+ cp -pr ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png ${THEME_DIR}/gtk-2.0/assets
52	+ cp -pr ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color} ${THEME_DIR}/gtk-2.0/gtkrc
53
54	mkdir -p ${THEME_DIR}/gtk-3.0
55	- cp -ur ${SRC_DIR}/src/gtk/assets ${THEME_DIR}/gtk-3.0
56	- cp -ur ${SRC_DIR}/src/gtk/common-assets ${THEME_DIR}/gtk-3.0
57	+ cp -pr ${SRC_DIR}/src/gtk/assets ${THEME_DIR}/gtk-3.0
58	+ cp -pr ${SRC_DIR}/src/gtk/common-assets ${THEME_DIR}/gtk-3.0
59
60	if [[ "${theme}" != '' ]]; then
61	sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.scss ${THEME_DIR}/gtk-3.0/gtk.css
62	[[ ${color} != '-dark' ]] && \
63	sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.scss ${THEME_DIR}/gtk-3.0/gtk-dark.css
64	else
65	- cp -ur ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css ${THEME_DIR}/gtk-3.0/gtk.css
66	+ cp -pr ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css ${THEME_DIR}/gtk-3.0/gtk.css
67	[[ ${color} != '-dark' ]] && \
68	- cp -ur ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css ${THEME_DIR}/gtk-3.0/gtk-dark.css
69	+ cp -pr ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css ${THEME_DIR}/gtk-3.0/gtk-dark.css
70	fi
71
72	mkdir -p ${THEME_DIR}/gtk-4.0
73	- cp -ur ${SRC_DIR}/src/gtk/assets ${THEME_DIR}/gtk-4.0
74	- cp -ur ${SRC_DIR}/src/gtk/common-assets ${THEME_DIR}/gtk-4.0
75	+ cp -pr ${SRC_DIR}/src/gtk/assets ${THEME_DIR}/gtk-4.0
76	+ cp -pr ${SRC_DIR}/src/gtk/common-assets ${THEME_DIR}/gtk-4.0
77
78	if [[ "${theme}" != '' ]]; then
79	sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.scss ${THEME_DIR}/gtk-4.0/gtk.css
80	[[ ${color} != '-dark' ]] && \
81	sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.scss ${THEME_DIR}/gtk-4.0/gtk-dark.css
82	else
83	- cp -ur ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css ${THEME_DIR}/gtk-4.0/gtk.css
84	+ cp -pr ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css ${THEME_DIR}/gtk-4.0/gtk.css
85	[[ ${color} != '-dark' ]] && \
86	- cp -ur ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css ${THEME_DIR}/gtk-4.0/gtk-dark.css
87	+ cp -pr ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css ${THEME_DIR}/gtk-4.0/gtk-dark.css
88	fi
89
90	mkdir -p ${THEME_DIR}/metacity-1
91	- cp -ur ${SRC_DIR}/src/metacity-1/assets/*.png ${THEME_DIR}/metacity-1
92	- cp -ur ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml ${THEME_DIR}/metacity-1/metacity-theme-1.xml
93	+ cp -pr ${SRC_DIR}/src/metacity-1/assets/*.png ${THEME_DIR}/metacity-1
94	+ cp -pr ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml ${THEME_DIR}/metacity-1/metacity-theme-1.xml
95	cd ${THEME_DIR}/metacity-1
96	ln -s metacity-theme-1.xml metacity-theme-2.xml
97	ln -s metacity-theme-1.xml metacity-theme-3.xml
98
99	mkdir -p ${THEME_DIR}/unity
100	- cp -ur ${SRC_DIR}/src/unity/{.svg,.png,dash-widgets.json} ${THEME_DIR}/unity
101	- cp -ur ${SRC_DIR}/src/unity/assets${ELSE_LIGHT} ${THEME_DIR}/unity/assets
102	+ cp -pr ${SRC_DIR}/src/unity/{.svg,.png,dash-widgets.json} ${THEME_DIR}/unity
103	+ cp -pr ${SRC_DIR}/src/unity/assets${ELSE_LIGHT} ${THEME_DIR}/unity/assets
104
105	mkdir -p ${THEME_DIR}/xfwm4
106	- cp -ur ${SRC_DIR}/src/xfwm4/{*.svg,themerc} ${THEME_DIR}/xfwm4
107	- cp -ur ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT} ${THEME_DIR}/xfwm4/assets
108	+ cp -pr ${SRC_DIR}/src/xfwm4/{*.svg,themerc} ${THEME_DIR}/xfwm4
109	+ cp -pr ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT} ${THEME_DIR}/xfwm4/assets
110
111	if [[ "${theme}" == '' ]]; then
112	mkdir -p ${THEME_DIR}/cinnamon
113	- cp -ur ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css ${THEME_DIR}/cinnamon/cinnamon.css
114	- cp -ur ${SRC_DIR}/src/cinnamon/assets/common-assets ${THEME_DIR}/cinnamon/assets
115	- cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg ${THEME_DIR}/cinnamon/assets/checkbox
116	- cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg ${THEME_DIR}/cinnamon/assets/menu
117	- cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg ${THEME_DIR}/cinnamon/assets/misc
118	- cp -ur ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg ${THEME_DIR}/cinnamon/assets/switch
119	- cp -ur ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png ${THEME_DIR}/cinnamon/thumbnail.png
120	+ cp -pr ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css ${THEME_DIR}/cinnamon/cinnamon.css
121	+ cp -pr ${SRC_DIR}/src/cinnamon/assets/common-assets ${THEME_DIR}/cinnamon/assets
122	+ cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg ${THEME_DIR}/cinnamon/assets/checkbox
123	+ cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg ${THEME_DIR}/cinnamon/assets/menu
124	+ cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg ${THEME_DIR}/cinnamon/assets/misc
125	+ cp -pr ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg ${THEME_DIR}/cinnamon/assets/switch
126	+ cp -pr ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png ${THEME_DIR}/cinnamon/thumbnail.png
127	fi
128
129	mkdir -p ${THEME_DIR}/plank
130	- cp -ur ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme ${THEME_DIR}/plank/dock.theme
131	+ cp -pr ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme ${THEME_DIR}/plank/dock.theme
132	}	10	}
133		11
134	install_gdm() {	12	bakground_image() {
135	@@ -213,7 +213,7 @@ install_icon() {	13	echo "Install with no nautilus bakground image..."
136	echo -e "\nInstalling Canta icon theme..."	14	- sed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
137		15	+ gsed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
138	# Copying files	16	}
139	- cp -ur ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
140	+ cp -pr ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
141		17
142	# update icon caches	18	theme_tweaks() {
143	gtk-update-icon-cache ${ICON_DEST_DIR}/Canta