Upgrade oomox

satellites/oomox.sat

@@ -4,35 +4,39 @@
 # git submodule
 
 name=oomox
-version=1.3.0
+version=1.5.0.4
-version_gtk_theme=15eb243288a1066f4facc07e9ada55abac770508
+version_gtk_theme=9b6bc1762d11f3b2ba48136dc1e8ae59422f94e5
-version_flat_theme=96bffc0b13c81a0a608e036da5b1c720e647a11a
+version_materia_theme=62d928cc46169b575822cc40b6c1a0627d1c3064
+version_archdroid_icon_theme=6dc4c92689ea2ce99534d6f461283efdf8ffd270
+version_gnome_colors_icon_theme=2f3d8dd3ce59e260803660f158a7a91d643518bf
+version_oomoxify=675fedce9a47745212b062e13a7e51b01f2bb581
 update_url="https://github.com/actionless/$name/releases"
 update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/actionless/$name/archive/$version/$name-$version.tar.gz" \
-          '505ae6937bfcb070b900443c124d4a9d'
+          'fa6967c43494d1e859fef534a31a0589'
 dlextract "https://github.com/actionless/$name-gtk-theme/archive/$version_gtk_theme/$name-gtk-theme-$version_gtk_theme.tar.gz" \
-          '1e8ac0b818129dc80d6d66de23d4e0ed'
+          'fb368633742cf90211201575394b1dd4'
-dlextract "https://github.com/nana-4/Flat-Plat/archive/$version_flat_theme/Flat-Plat-$version_flat_theme.tar.gz" \
+dlextract "https://github.com/nana-4/materia-theme/archive/$version_materia_theme/materia-theme-$version_materia_theme.tar.gz" \
-          '808117c556f10ec9fff38e93dc0201e9'
+          'f6851f54ec512c2785737d3f6b8ac813'
+dlextract "https://github.com/actionless/$name-archdroid-icon-theme/archive/$version_archdroid_icon_theme/$name-archdroid-icon-theme-$version_archdroid_icon_theme.tar.gz" \
+          '6fddfe5d8b4682a10978ff2013dc1fbf'
+dlextract "https://github.com/actionless/$name-gnome-colors-icon-theme/archive/$version_gnome_colors_icon_theme/$name-gnome-colors-icon-theme-$version_gnome_colors_icon_theme.tar.gz" \
+          '857b1a74b50b6ec9b663564e9cbda1e8'
+dlextract "https://github.com/actionless/oomoxify/archive/$version_oomoxify/oomoxify-$version_oomoxify.tar.gz" \
+          'f8a91a6406ef6faacfc7f88b89a5ffdf'
 _
 
 cd "$name-$version"
-mv -T "../$name-gtk-theme-$version_gtk_theme" gtk-theme
+mv -T "../$name-gtk-theme-$version_gtk_theme" plugins/theme_oomox/gtk-theme
-mv -T "../Flat-Plat-$version_flat_theme" flat-plat-theme
+mv -T "../materia-theme-$version_materia_theme" plugins/theme_materia/materia-theme
+mv -T "../$name-archdroid-icon-theme-$version_archdroid_icon_theme" plugins/icons_archdroid/archdroid-icon-theme
+mv -T "../$name-gnome-colors-icon-theme-$version_gnome_colors_icon_theme" plugins/icons_gnomecolors/gnome-colors-icon-theme
+mv -T "../oomoxify-$version_oomoxify" plugins/oomoxify
 
-# Run the PKGBUILD package() function
+# Run the install script in a contained directory
-ln -s . oomox
 mkdir -p install
-ln -s ../install gtk-theme/install
+packaging/install.sh "$PWD" "$PWD/install"
-ln -s ../install flat-plat-theme/install
-(
-    pkgdir=./install
-    python() { python3 "$@"; }
-    . ./PKGBUILD
-    package
-)
 
 # Install the package properly
 mkdir -p "$dir_install/$dir_prefix/$dir_data/$name"
@@ -40,10 +44,13 @@ cp -Ta install/opt/oomox "$dir_install/$dir_prefix/$dir_data/$name"
 
 # Patch and install wrappers
 sed -i -e "2ccd '/$dir_prefix/$dir_data/$name'" install/usr/bin/*
-sed -i -e "2ccd '/$dir_prefix/$dir_data/$name/gtk-theme'" install/usr/bin/oomox-cli
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" install/usr/bin/*
 
 # Install desktop
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/applications" install/usr/share/applications/oomox.desktop
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/applications" install/usr/share/applications/com.github.actionless.oomox.desktop
+
+# Install icons
+mkdir -p "$dir_install/$dir_prefix/$dir_data/icons"
+cp -Ta install/usr/share/icons/hicolor "$dir_install/$dir_prefix/$dir_data/icons/hicolor"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: