Merge pull request #729 from nextcloud/fix/update-icons

fix(tool,neon,neon_files,app): Update icons
nextcloud · Sep 7, 2023 · 7abf6e0 · 7abf6e0
2 parents 6dd441d + 902d553
commit 7abf6e0
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 2 deletions.
diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-hdpi/app_files.png
diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-mdpi/app_files.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_files.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_files.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png
diff --git a/packages/neon/neon/assets/icons/server/alarm.svg.vec b/packages/neon/neon/assets/icons/server/alarm.svg.vec
diff --git a/packages/neon/neon/assets/icons/server/computer.svg.vec b/packages/neon/neon/assets/icons/server/computer.svg.vec
diff --git a/packages/neon/neon/assets/icons/server/default-source.svg.vec b/packages/neon/neon/assets/icons/server/default-source.svg.vec
diff --git a/packages/neon/neon_files/assets/app.svg b/packages/neon/neon_files/assets/app.svg
diff --git a/tool/generate-neon.sh b/tool/generate-neon.sh
@@ -34,7 +34,9 @@ mkdir -p "$icons_dir"
 shopt -s extglob
 for file in external/nextcloud-server/{core/img/*,apps/*/img}/!(app|app-dark).svg; do
   name="$(basename "$file" | sed "s/.svg$//" | sed "s/-dark$//" | sed "s/-white$//").svg"
-  cp -u "$file" "$icons_dir/$name"
+  if ! grep "<image " "$file"; then
+    cp -u "$file" "$icons_dir/$name"
+  fi
 done
 
 (