Move application icons out of style/img/

Dyalog · Feb 15, 2017 · e5d13be · e5d13be
1 parent e0717ec
commit e5d13be
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/style/img/D.icns → D.icns b/style/img/D.icns → D.icns
diff --git a/style/img/D.png → D.png b/style/img/D.png → D.png
diff --git a/style/img/icns.sh → D.sh b/style/img/icns.sh → D.sh
diff --git a/style/img/D.svg → D.svg b/style/img/D.svg → D.svg
diff --git a/mk b/mk
@@ -76,11 +76,10 @@ const incl={
   '/node_modules/streamsearch/lib/sbmh.js':1}
 Object.keys(incl).map(x=>{const a=x.split('/');a.map((_,i)=>incl[a.slice(0,i).join('/')]=1)}) // include ancestors
 
-const excl={'/style/img/D.icns':1}
-,namev='ride'+v.split('.').slice(0,2).join('')
+const namev='ride'+v.split('.').slice(0,2).join('')
 ,pkg=(x,y,f)=>{rq('electron-packager')(
   {dir:'.',platform:x,arch:y,out:'_/'+namev,overwrite:true,'download.cache':'cache',icon:'favicon.ico',tmpdir:false,
-    ignore:p=>!incl[p]&&!/^\/(src|style|lib|_)(\/|$)/.test(p)&&!(x==='win32'&&/^\/windows-ime(\/|$)/.test(p))||excl[p],
+    ignore:p=>!incl[p]&&!/^\/(src|style|lib|_)(\/|$)/.test(p)&&!(x==='win32'&&/^\/windows-ime(\/|$)/.test(p)),
     'app-copyright':`(c) 2014-${new Date().getFullYear()} Dyalog Ltd`,
     'app-version':v,
     'build-version':v,

diff --git a/packagescripts/linux/packageLinux.sh b/packagescripts/linux/packageLinux.sh
@@ -30,7 +30,7 @@ APP_NAME=$(node -e "console.log($(cat package.json).productName)") # "Ride-4.0"
 echo "Packaging for $TARGET"
 
 RIDEDIR="_/ride40/${APP_NAME}-linux"
-ICON="style/img/D.svg"
+ICON="D.svg"
 SBOXDIR=/tmp/ride$$
 postinst=/tmp/postinst$$
 prerm=/tmp/prerm$$