From 5e472586006ed27a92c0e7bb1071993064ac3140 Mon Sep 17 00:00:00 2001
From: KockaAdmiralac <1405223@gmail.com>
Date: Fri, 3 Aug 2018 00:25:31 +0200
Subject: [PATCH] Make Journal not create a symlink and instead a .desktop file
 on select DEs, make Color an array of strings

---
 binding-mri/wallpaper-binding.cpp |  10 +++++-----
 journal/unix/images/icon.png      | Bin 0 -> 22176 bytes
 scripts/Script.rb                 |  18 +++++++++++++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 journal/unix/images/icon.png

diff --git a/binding-mri/wallpaper-binding.cpp b/binding-mri/wallpaper-binding.cpp
index 6eb054c..a27971b 100644
--- a/binding-mri/wallpaper-binding.cpp
+++ b/binding-mri/wallpaper-binding.cpp
@@ -338,11 +338,11 @@ end:
 					"d.writeConfig(\"Image\", \"file://" << concatPath << "\");" <<
 					"d.writeConfig(\"FillMode\", \"6\");" <<
 					"d.writeConfig(\"Blur\", false);" <<
-					"d.writeConfig(\"Color\", \"" <<
-						std::to_string((color >> 16) & 0xFF) << "," <<
-						std::to_string((color >> 8) & 0xFF) << "," <<
+					"d.writeConfig(\"Color\", [\"" <<
+						std::to_string((color >> 16) & 0xFF) << "\", \"" <<
+						std::to_string((color >> 8) & 0xFF) << "\", \"" <<
 						std::to_string(color & 0xFF) <<
-					"\");" <<
+					"\"]);" <<
 				"}" <<
 			"'";
 			Debug() << "Wallpaper command:" << command.str();
@@ -458,7 +458,7 @@ RB_METHOD(wallpaperReset)
 						"d.writeConfig(\"Image\", dat.picture);" <<
 					"}" <<
 					"if (dat.color) {" <<
-						"d.writeConfig(\"Color\", dat.color);" <<
+						"d.writeConfig(\"Color\", dat.color.split(\",\"));" <<
 					"}" <<
 					"if (dat.mode) {" <<
 						"d.writeConfig(\"FillMode\", dat.mode);" <<
diff --git a/journal/unix/images/icon.png b/journal/unix/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..41a1cfd23b932201130847fedc9e7ddfc80e9261
GIT binary patch
literal 22176
zcmeI42~<;88pj_9iZB$kRKYbsr&=u}A#6z@1PKaS5ZSf3gyaE{kc1?VfI^~JEww5x
ztxKyoR@qb#Ma4l0Ds)^}iU_FGT~H#ZD2RZ-yqB;%Fz|4eGs8JA=Op>O@Be+@y}x_!
z_in<8iC&%y^mV7`0sx@z?nd_p04>PW0(8bgZ_?>=6QH;8e7B`S0MPpserf>wel>;^
z)7dUAUS4555l<M#<Kx_2TyT5=FNDnj0YGwR%TLQWMt;T{lkbvA;hLp>+7|A64{Dko
zSz0h#U*m40WzD5!wl$O3%tJNxx9?_G+-@r7w2coaq(9bA6K^bhCteU7d`LrTCNZ@$
z{zgal)}F9j*}G3CPUIRXia6qNVMW50k~R4+<K!<LLql*;>5n?NH`bfreQW1c-La!G
zj#%z|Lj1YB<m3<2-|h8I*YRqK+uc!he5N}PbSw8=moyXfu{vSeWcbG(-3Al4X+URg
z<55HJ<poupf15ckLr0Vz_xRJKSd(WNu8}$-kNHhgX}hOb7|;~<tM0U1Gdk=ET-ZrG
zKWX!CGk|Av+!oLI$C+#29rN?vlJWRjV4lIPuH^9FBP^dCAN%vT3iG^mElHAyj2$)l
z&CZWDEWf%9SWJ6#?bs=C?q~O#E^|x*^{(2K)Mx+YgvO2pzth669=T`43i+n-tzL1>
z+N-obm$!VesWoRc{`SQJtrKH+h!uh~on~1G`Qaa7zDFCqw!A*z7I4(_YS4^l+Knak
zzrPR^rpL`F-uh&+y+P%;jo-dI7ceJpA<ZsK?ta#5Yfg^z{fV0j=Vr+ZKJmsxvdNPL
zlU|*mQjF_$?R<YbzAW;XqG8(VTIsTYgj)Z#MdC$8X?Bk3`)adiuY7qlZLR5}n~QEt
z4R3mWs=>oI$$Aex_;KXa%~skc1K-V_;v32T64#V8`*ZHsq2@c?G*gz?7n?<nPui7~
z<_~Vl+F1B_ite~y)*aZ!4qo!qz(J9HUPEEslxA`9(-y&nq6)*guFE(R*x4RNMbX)Q
z&CJBmB4O~RD~UPJCfD3KedHE>l1=8>m=#A73l9~qIQi?vzaCzHJxgM(Gf7+<C>F+r
zKK(xSYIfPo3lrX4GhIcg^Z&El(cpEEJY!`AUJ=l8y*+4_OZU>`il@!j#U(d#%fNFF
zN*zh~13z6XI<k>9HZft-k0s}crIBx61#F9!SpKjRzalXHEx+>Xs=LmOZx-;bRBz(x
z3lE=7NRck=-kZNC-l=m*ySQ<BBdIaGao5}LqCZ*m_3{1X`Q`Z))bjiv_gCH!r^UTx
z1;;Hq?|R|q+>ojukjkwquB_V`l6^Te)7oxtLLG$^nz=gp+aUal1DEZ&HOWP%51qfI
z@8(c!T{@9hX*}bTj_tEG=j2MJou8HJ_hoG17erB6<Gnd&65m?SzjwvN<SS-EIgeu%
zZL)W3Mt12Hlg{5M=F;lMoZWkTH@>Fn5dL^&FelaD;CM-WGs*w=*5z#dnCO*Rev!);
zkx$1O2QD1zU2-j*`gY6W!17t0A$zrw0wePizAL-@R!-~qTY`u6Lpm@wS+VMQ-ox#!
z51v#+`;?sNnvhu7YUq2Gv-QBwq0Zf4d{^Bvw+s4b@9#_Q?nr2BtC_jpc3kRRsm8(N
zwSE`*C)WXheJa~GP!#C#4TZ^zuw<}!!Jwrif)AAy0B~@U@EOc-P=pHxL)lzMvzK{t
zGaQ@cXcl1OLGa+afMIO6SOMr0>*>pk4QG;BW=>RH2MGlV5CMu9I7tMDE2Kyq&6IH|
zkPSEE&2UPIDBRJ^8BT}`^zg#D@B|>v#?sb;NhI0h?8ufx8?wEX^;bA60?`&vAmfSF
z76c-NK&B9gxSod@RTr`x1gsE>H+_CjI_O`HW?>=`pMuAW#bQe_$&x1s#S_V7GM-?C
zx3aQ;6c)l5u81MA;0n!EL3-oRK_OGX=8M=oE)I^%2<AnJ9L>z&M17B*aYgX^5^;q+
z>>!GG34@O(S`zT;oLJ00AAXd8qwE@si3d4g1jrQ$AwQy8KYnj1?{goJvhVVciJ>|1
z@KEpE+uw)?wW)<7*Jubq57Gf?dp(7|F?<m34GMWt0w(Ah4GqOy-RMQ^kp9UT5DC6A
zWZyvvdk8o9ipov76jU?h0F9O6A^;g8kPbbm&<e7%AdoCb1Ye>p#fC(&hL(~Yg+Oq?
z4^sBevNDDTkHrp&Q5VA+T7}3M2<6}y(28d<M2rzdL23uZQI3Zv@a6G1RMoEOzq>;>
zcX*7r*&Ylgn+xCazeEhJ#|aUS#iWGr1Q84ol^wwd1@U}tr~|&g5uxl`R}>c>hbMrB
z2~tT8cy-Ncy`Xc4m+II-T>x@H0h@{QUN8^W(}oO$P$D8JS1rYzD-<!fOwgT9g&Hi`
zY!-z8+7Ov!CNz;ukYHgA5?B`Yw!tA5L;{0JVz5G(WRR(3;NgLE{~$D-$Bcq^UQcM&
zM}|hYe-L`HfDKhm1_z;md;hU1)P(sUl^a_q;t669djQ%A%DU(SMh<N4y})5B>l>dT
z5Q6aTbu{bUzI_F;uin8v$|^u%FyYEb6*8hhmIHo3TYsne{Cb?&|LXLq;v?LL&LIv1
zxq~-4a+9h;DOE!U5%NMrVuk>84uw|4$aa}3?m)+(6EMRV+)$83#rLx7Z5Zt0fQN5B
z9QMGuQ?(A9(%wb>;Sz9wYbpg=KG0wo%4s7y;6G^V&#cl1!pndYrPSM55ugX22*38Y
zA}<eiT{^rg^73HUeosFxTST?$$u_7N;RP3dRZa4N&L|+&*2acp<A5LBJlMmFEde=!
zbT+i*h44Zq60EFyyar!V>$-GkSHz_rSJiYOP87=7RJB6q73iph?>j3EoanwC^dC0*
z$Mhc#j0}e*LDE3AF<hvKkOB-Bk_M`c;X*}(6kxcJG*E2}7b+s80K<i(fofy8P!S;o
z7%n6YR2##EiU=vda3N`++88cWL`VUK3rPdj#&Dq`LJBZkNE)a%h6@!DQh?z?(m=H_
zT&ReU0t^?D2C9wWLPdlWV7QPpP;CqsDk7u+!-b@QYGb%i5g`Q_E+h?98^eW)2r0mD
zA!(r67%o&qNCAcmNdwi!aG@eX3NTzq8mKmg3l$MkfZ;;YK(#SksECjP3>T6Hs*T}7
zMT8V!xR5kZZ44JGBBTJrg`|OM4~t8;|JR2g7y8Me82W8t&5Gku(C-p)OgC>20EpNF
z0K%;R@OljZY`6me++6@rI|TqpvjD(k@?Q68Qs{l5JKfn=a;M?XC7zGn3}uX1FxzFK
z#Q8wsDSmgt#YbA3C+{#WTvYOz|FXHK7scJzrdXcc|LUmg=I`f1i5{%!xU2)c)1as7
zm)Gc~p;D^>zoMG(Z@JMU(qI)ZvWSS3|E1un-u&CaW!DuM1_w`vOa_c@-q&a7#-y~C
zPbPq_l1_m9>&FiGWBP<3glcL5=5SYrK_BS0`TIL#!b&WGg^HIO3EEeP7q-RAjQl%W
z?UMd69(G1ef)M=MRMmHt1`srd?}_ZYobS^dWmOHDI9I9NhA#mVXgUlI(krFXF)^cY
zI%J31^Gv_dc<?%<HM`m1ghDP~=imuXhYWrJ;7yHg;$Rg3qXTg8%W&q%BFa=@WD}rw
zm95_ItHUHsz=|V1=3VWywv?+0c>MtV?+zpA1`bxK`l&v$`qq(+Q5jqYtb&)R(jEec
z9(%%)HNf%P+DV7yQ!g1^IoX-LaC!GDa^CnPR_sh4Dd6ATssAKWnG}u%(BKyU)f{FY
zA~uoI9AQLdN<-jBl=Q1i_fG)4${z|nmrFaCe(miVvg^W8)_s7#grNnPjH=BXszux9
zwnBbRn^x6Prl&Ldpf62%e9Nl3JLYS8ZQFuV<FYlLmpZj|N@KG%fQk0X<&4;Q-FjW)
zpoJLZ72c(-8Rfdc^mD=g;~IM~_1TX=nxe)2OmU0!-Y477#p|s(m=ji%C4XDHICXcO
zDUdd*?tG&8w3NHClT*9`a{g>FNR3m>k~nTnf6lXWQM`Hjuq+<ff~ye4vVY2wuXMV#
z?un!H>C+Hh-&$qqP+v{ew<2a5&6L6QXv8-uV|XE{&#7!Jn7536a|SK^NR~9P@e(uX
zoW>TMPfLm1>7|eOK{Scp*jb$!Bt1~yELMzrR&B6-?HJjy*0T3O?Rp2>?<e0LRTV>d
z8ncM%WSrKkG0e!933ivow>6Y?+#JuTmM@e`PvN^--tUO*?x;+7dH>o}LWg$4*xb&<
zls0mdW@UF*aoy;e)?G6SvRVw!Xm~Zx#YMF=?B?b8x4&3m-GLX6iPd(#D=%2Mvg>)<
zRXxJ?(R6&MhwDrHDccQnUMjhD486WKD>HLh{qy_Wu4cn8DAVMBS@(Cd*3LDRmmFso
zkETPmXg&~imsfQptGiKTnLlRVrh@lx=r3Mxdc50WPuQ9@%iG%<o#x1;S4UNGp_t1Y
zT7QXBwDVF={X$#H&`PS~zn>G=SyL1KX4VqY`b(p#fP`xKM$4C`W_CwY^2Qrgc?UQZ
z<I`uZ%4?r%RW040?2{#z$LN#+e$%(Egzgc%tVJuGd`DH$pqL*#dA8!VA?~WZ+}bBC
zyj|jXp}Vt$nXBg;Wgl;%X*8-9-`^EujGx9`4}$M(wpxOFQYJ||V;}W^cdJzT=2^$g
z*==3syGK{;!&TeA{I;(B^6JSiG;gl$x?0!r?d|5KUG48%?Y7zCjN-b|OGa1C^QwUc
zRQr6Uf8Ghb2B~ay%C^*-tt;W_sqPx{;W1eK;ix+>6uLDR9HDP8rA>ss;2ZIW#-5LO
zu*b+gKPnw)uzrY7q+LIi>ZEagZ7ng98Qr5A*~U4<XsS8Rs~<;yt4x_<m~$IKfKzJw
zeTVqqtrX}0^I`SK#LB=jSU=ne5+T6B(h&w9+1O;th)OL^X%6l=p8<XPE~s_Ya{&O$
zYollFf3V(AR~AArvbFlr-*wQGg#Syy2Y(6k0f4~*Rc{cZ9>yH(E9*`x)d3#7zN7=l
z^hVW}F&1Xuz!Q*9{@<1{1Z#}~c>4`E8<U_vvarK(0iA(~kP-mgT|McU^H#0@C$~6c
A0RR91

literal 0
HcmV?d00001

diff --git a/scripts/Script.rb b/scripts/Script.rb
index f3bbc5f..bf6845b 100644
--- a/scripts/Script.rb
+++ b/scripts/Script.rb
@@ -2,6 +2,8 @@ PROTO_TEXT = "put me in the big portal"
 CEDRIC_TEXT = "put me in the big portal"
 RUE_TEXT = "put me in the big portal"
 
+SUPPORTED_DE = ["cinnamon", "gnome", "mate", "kde", "xfce"]
+
 module Script
   def self.px
     logpos($game_player.x, $game_player.real_x, $game_player.direction == 6)
@@ -385,7 +387,21 @@ module Script
         end
       end
     else
-      File.symlink Dir.pwd + "/" + Oneshot::JOURNAL, Oneshot::GAME_PATH + "/Oneshot/" + Oneshot::JOURNAL
+      if Oneshot::OS == "linux" and SUPPORTED_DE.include? Oneshot::DE
+        path = Oneshot::GAME_PATH + "/Oneshot/" + Oneshot::JOURNAL + ".desktop"
+        File.open(path, "wb") do |output|
+          output.write("[Desktop Entry]\n")
+          output.write("Comment=...\n")
+          output.write("Terminal=false\n")
+          output.write("Name=_______\n")
+          output.write("Exec=#{Dir.pwd}/#{Oneshot::JOURNAL}\n")
+          output.write("Type=Application\n")
+          output.write("Icon=#{Dir.pwd}/images/icon.png\n")
+        end
+        FileUtils.chmod 0777 path
+      else
+        File.symlink Dir.pwd + "/" + Oneshot::JOURNAL, Oneshot::GAME_PATH + "/Oneshot/" + Oneshot::JOURNAL
+      end
     end
 	rescue Errno::EACCES => e
 	  #this probably means the clover.exe already exists and is running, so no need to create it again