diff --git a/style/img/D.icns b/D.icns similarity index 100% rename from style/img/D.icns rename to D.icns diff --git a/style/img/D.png b/D.png similarity index 100% rename from style/img/D.png rename to D.png diff --git a/style/img/icns.sh b/D.sh similarity index 100% rename from style/img/icns.sh rename to D.sh diff --git a/style/img/D.svg b/D.svg similarity index 100% rename from style/img/D.svg rename to D.svg diff --git a/mk b/mk index 5e580208..8c8726a8 100755 --- 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 index 327e18f2..ccf750ce 100755 --- 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$$