desktop/oomox: Updated for version 1.7.0.2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 62 insertions, 76 deletions

diff --git a/desktop/oomox/README b/desktop/oomox/README
index fb6d25c237..ff22730327 100644
--- a/desktop/oomox/README
+++ b/desktop/oomox/README
@@ -9,6 +9,7 @@ corresponding variables to the script
 
 ARCHDROIDVER    (for icons_archdroid)
 GNOMECOLORSVER  (for icons_gnomecolors)
+BASE16VER       (for import_base16)
 OOMOXIFYVER     (for oomoxify)
 ARCVER          (for theme_arc)
 MATERIAVER      (for theme_materia)
@@ -16,7 +17,7 @@ OOMOXVER        (for theme_oomox)
 
 for example
 
-  OOMOXVER=1.9.0  MATERIAVER=20180519  ./oomox.SlackBuild
+  OOMOXVER=1.9.0.1  ARCHDROIDVER=1.0.2  ./oomox.SlackBuild
 
 but you will need to manually place the corresponding tarball(s) in the
 slackbuild directory.
diff --git a/desktop/oomox/oomox.SlackBuild b/desktop/oomox/oomox.SlackBuild
index e6f47a6c34..108322673f 100644
--- a/desktop/oomox/oomox.SlackBuild
+++ b/desktop/oomox/oomox.SlackBuild
@@ -23,18 +23,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oomox
-VERSION=${VERSION:-1.7.0.1}
+VERSION=${VERSION:-1.7.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
 
-ARCVER=${ARCVER:-20170302}
+ARCVER=${ARCVER:-c49e1f7fb0aa937789f7c2430c74479e66b6b230}
 ARCHDROIDVER=${ARCHDROIDVER:-1.0.2}
+BASE16VER=${BASE16VER:-d022b9daa5c233a08a8d3b94fd534a3041e3a8c1}
 GNOMECOLORSVER=${GNOMECOLORSVER:-5.5.3}
-MATERIAVER=${MATERIAVER:-20180519}
-OOMOXVER=${OOMOXVER:-1.9.0}
-OOMOXIFYVER=${OOMOXIFYVER:-1.0}
+MATERIAVER=${MATERIAVER:-df30959eb068ef55db18a18ed23a4a1c79129768}
+OOMOXVER=${OOMOXVER:-1.9.0.1}
+OOMOXIFYVER=${OOMOXIFYVER:-1.0.0.1}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -64,67 +65,47 @@ cp -a colors locale oomox_gui plugins po terminal_templates \
   gui.sh \
   $PKG/opt/oomox
 
-tar xvf $CWD/arc-theme-$ARCVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/theme_arc/arc-theme
-( cd $PKG/opt/oomox/plugins/theme_arc/arc-theme
-  rm -fr .git*
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
-
-tar xvf $CWD/archdroid-icon-theme-$ARCHDROIDVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/icons_archdroid
-( cd $PKG/opt/oomox/plugins/icons_archdroid
-  rm -fr .git*
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
+# Begin Plugins Installation
+tar xvf $CWD/arc-theme-$ARCVER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/theme_arc/arc-theme
+
+tar xvf $CWD/archdroid-icon-theme-$ARCHDROIDVER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/icons_archdroid
 
-tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/icons_gnomecolors
+tar xvf $CWD/base16-builder-$BASE16VER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/import_base16/base16-data
+
+tar xvf $CWD/gnome-colors-icon-theme-$GNOMECOLORSVER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/icons_gnomecolors
 ( cd $PKG/opt/oomox/plugins/icons_gnomecolors
   rm -fr gnome-colors-icon-theme
-  mv gnome-colors gnome-colors-icon-theme
-  rm -fr .git*
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
-
-tar xvf $CWD/oomoxify-$OOMOXIFYVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/oomoxify
-( cd $PKG/opt/oomox/plugins/oomoxify
-  rm -fr .git*
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
-
-tar xvf $CWD/materia-theme-$MATERIAVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/theme_materia/materia-theme
-( cd $PKG/opt/oomox/plugins/theme_materia/materia-theme
-  rm -fr .git*
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
-
-tar xvf $CWD/$PRGNAM-gtk-theme-$OOMOXVER.tar.gz --strip-components=1 -C $PKG/opt/oomox/plugins/theme_oomox/gtk-theme
-( cd $PKG/opt/oomox/plugins/theme_oomox/gtk-theme
-  rm -fr .git* .editorconfig .*.yml {D,d}ocker* maintenance* screenshot* test*
+  mv gnome-colors gnome-colors-icon-theme )
+
+tar xvf $CWD/oomoxify-$OOMOXIFYVER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/oomoxify
+
+tar xvf $CWD/materia-theme-$MATERIAVER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/theme_materia/materia-theme
+
+tar xvf $CWD/$PRGNAM-gtk-theme-$OOMOXVER.tar.gz --strip-components=1 \
+  -C $PKG/opt/oomox/plugins/theme_oomox/gtk-theme
+
+rm -fr $PKG/opt/oomox/plugins/*/.git* \
+  $PKG/opt/oomox/plugins/*/*/.git* \
+  $PKG/opt/oomox/plugins/theme_oomox/gtk-theme/.editorconfig \
+  $PKG/opt/oomox/plugins/theme_oomox/gtk-theme/.*.yml \
+  $PKG/opt/oomox/plugins/theme_oomox/gtk-theme/{D,d}ocker* \
+  $PKG/opt/oomox/plugins/theme_oomox/gtk-theme/maintenance* \
+  $PKG/opt/oomox/plugins/theme_oomox/gtk-theme/screenshot* \
+  $PKG/opt/oomox/plugins/theme_oomox/gtk-theme/test*
+
+( cd $PKG/opt/oomox/plugins
   chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; )
+  find -L . -type d -exec chmod 755 {} \;
+  find -L . -type f -exec chmod 644 {} \;
+  find -L . -type f \( -name '*.sh' -o -name '*.py' \) -exec chmod 755 {} \;
+)
+# End of Plugins Installation
 
 mkdir -p $PKG/usr/bin
 cp -a packaging/bin/* $PKG/usr/bin
@@ -136,11 +117,13 @@ mkdir -p $PKG/usr/share/applications
 cp -a packaging/com.github.themix_project.Oomox.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/share/icons/hicolor/symbolic/apps
-cp -a packaging/com.github.themix_project.Oomox-symbolic.svg $PKG/usr/share/icons/hicolor/symbolic/apps/com.github.themix_project.Oomox-symbolic.svg
+cp -a packaging/com.github.themix_project.Oomox-symbolic.svg \
+  $PKG/usr/share/icons/hicolor/symbolic/apps/com.github.themix_project.Oomox-symbolic.svg
 
 for SIZE in 16 24 32 48 512; do
   mkdir -p $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-  cp -a packaging/com.github.themix_project.Oomox-$SIZE.png $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/com.github.themix_project.Oomox.png
+  cp -a packaging/com.github.themix_project.Oomox-$SIZE.png \
+    $PKG/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/com.github.themix_project.Oomox.png
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/oomox/oomox.info b/desktop/oomox/oomox.info
index cbaf575a19..9598384e96 100644
--- a/desktop/oomox/oomox.info
+++ b/desktop/oomox/oomox.info
@@ -1,20 +1,22 @@
 PRGNAM="oomox"
-VERSION="1.7.0.1"
+VERSION="1.7.0.2"
 HOMEPAGE="https://github.com/themix-project/oomox"
-DOWNLOAD="https://github.com/themix-project/oomox/archive/1.7.0.1/oomox-1.7.0.1.tar.gz \
-          https://github.com/horst3180/arc-theme/archive/20170302/arc-theme-20170302.tar.gz \
+DOWNLOAD="https://github.com/themix-project/oomox/archive/1.7.0.2/oomox-1.7.0.2.tar.gz \
+          https://github.com/actionless/arc-theme/archive/c49e1f7fb0aa937789f7c2430c74479e66b6b230/arc-theme-c49e1f7fb0aa937789f7c2430c74479e66b6b230.tar.gz \
           https://github.com/themix-project/archdroid-icon-theme/archive/1.0.2/archdroid-icon-theme-1.0.2.tar.gz \
+          https://github.com/base16-builder/base16-builder/archive/d022b9daa5c233a08a8d3b94fd534a3041e3a8c1/base16-builder-d022b9daa5c233a08a8d3b94fd534a3041e3a8c1.tar.gz \
           https://github.com/themix-project/gnome-colors-icon-theme/archive/5.5.3/gnome-colors-icon-theme-5.5.3.tar.gz \
-          https://github.com/nana-4/materia-theme/archive/v20180519/materia-theme-20180519.tar.gz \
-          https://github.com/themix-project/oomox-gtk-theme/archive/1.9.0/oomox-gtk-theme-1.9.0.tar.gz \
-          https://github.com/themix-project/oomoxify/archive/1.0/oomoxify-1.0.tar.gz"
-MD5SUM="cac9a25ed295cfaadb81be0f7c174ea6 \
-        fe3e397ffc3633c1b5ba3b1d6e2456a7 \
+          https://github.com/actionless/materia-theme/archive/df30959eb068ef55db18a18ed23a4a1c79129768/materia-theme-df30959eb068ef55db18a18ed23a4a1c79129768.tar.gz \
+          https://github.com/themix-project/oomox-gtk-theme/archive/1.9.0.1/oomox-gtk-theme-1.9.0.1.tar.gz \
+          https://github.com/themix-project/oomoxify/archive/1.0.0.1/oomoxify-1.0.0.1.tar.gz"
+MD5SUM="d98a9d2d2db29e8496f8684a965b8033 \
+        23460fc1c478f6595a56c9a6a98bdac8 \
         cb669130685dcbf03a8f7f5738c71dc6 \
+        38fc51a55c798032266c03ee82461119 \
         ae3250f1dce9505dbaa60d92dcb9a239 \
-        354428d8d720437ccaacd36fc69af14c \
-        0769a6c072d8ad7661a16b67a6bcdd48 \
-        df970e658de7668a7088bd445e4634fb"
+        47bb49b8560bea49726b02d6af1fee6a \
+        84d1c8416cff7736c4584e3329122174 \
+        62be7e51ed58135765c1758a6a1df2d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pygobject3-python3 python3-pillow sassc"