diff --git a/Dockerfile b/Dockerfile index 7b8e8f6..8c4540b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,8 +64,5 @@ RUN unzip -q webos_cli_tv.zip -d ${WEBOS_SDK_PATH} \ && chmod -R +x ${WEBOS_SDK_PATH}/CLI/bin \ && rm webos_cli_tv.zip -# Replace lib/deviceInfo.js with patched version until it will be officially released -COPY vendor/deviceInfo-patched.js ${WEBOS_SDK_PATH}/CLI/lib/deviceInfo.js - # Add tizen/webos cli to PATH ENV PATH $PATH:/tizen-studio/tools/:/tizen-studio/tools/ide/bin/:/tizen-studio/package-manager/:${WEBOS_SDK_PATH}/CLI/bin diff --git a/README.md b/README.md index ccb06f5..f302da6 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Available CLI commands: - [Build container](#build-container) - [Slow way](#slow-way) - [Fast way](#fast-way) + - [Update webOS sdk](#update-webos-sdk) - [Test](#test) - [Generate TOC](#generate-toc) - [Publish to Docker Hub](#publish-to-docker-hub) @@ -323,10 +324,16 @@ docker build -t vitalets/tizen-webos-sdk . TIZEN_STUDIO_VERSION=4.1.1 docker run -d --rm --name nginx-temp -p 8080:80 -v $(pwd)/vendor:/usr/share/nginx/html:ro nginx \ && docker build -t vitalets/tizen-webos-sdk . \ - --build-arg TIZEN_STUDIO_URL=http://host.docker.internal:8080/web-cli_Tizen_Studio_${TIZEN_STUDIO_VERSION}_ubuntu-64.bin \ + --build-arg TIZEN_STUDIO_URL=http://172.17.0.1:8080/web-cli_Tizen_Studio_${TIZEN_STUDIO_VERSION}_ubuntu-64.bin \ ; docker stop nginx-temp ``` +### Update webOS sdk +1. Download [latest installer for linux](https://webostv.developer.lge.com/sdk/installation/download-installer/#) +2. Unzip `webOS_SDK_TV_Installer_linux64_min.zip` +3. Unzip again `webOS_SDK_TV_linux64.zip` +4. Copy `webos_cli_tv.zip` to `vendor` dir + ### Test ```bash ./test.sh @@ -341,7 +348,7 @@ docker run --rm -it -v $(pwd):/usr/src jorgeandrada/doctoc --github README.md 1. Check [existing tags](https://hub.docker.com/repository/docker/vitalets/tizen-webos-sdk/tags?page=1&ordering=last_updated) on docker hub. 2. Set new tag and push to registry: ```bash -TAG=1.0 +TAG=x.x docker tag vitalets/tizen-webos-sdk:latest vitalets/tizen-webos-sdk:$TAG docker push vitalets/tizen-webos-sdk:$TAG ``` diff --git a/test.sh b/test.sh index b785a34..0176aaa 100755 --- a/test.sh +++ b/test.sh @@ -15,6 +15,6 @@ assert() { fi } -assert "$(cmd tizen version)" "Tizen CLI 2.5.21" -assert "$(cmd sdb version)" "Smart Development Bridge version 4.2.12" -assert "$(cmd ares-setup-device --version)" "Version: 1.10.4-j1703-k" +assert "$(cmd tizen version)" "Tizen CLI 2.5.25" +assert "$(cmd sdb version)" "Smart Development Bridge version 4.2.16" +assert "$(cmd ares-setup-device --version)" "Version: 1.11.0-j31-k" diff --git a/vendor/deviceInfo-patched.js b/vendor/deviceInfo-patched.js deleted file mode 100644 index 1f27e4d..0000000 --- a/vendor/deviceInfo-patched.js +++ /dev/null @@ -1 +0,0 @@ -var util=require("util"),async=require("async"),npmlog=require("npmlog"),luna=require("./base/luna"),path=require("path"),novacom=require("./base/novacom");(function(){var a=npmlog;a.heading="deviceInfo";a.level="warn";var e={log:a,systemInfo:function(s,o){if(typeof o!=="function"){throw new Error("Missing completion callback (next="+util.inspect(o)+")")}s=s||{};async.series([e,n],function(e,n){a.verbose("deviceInfo#systemInfo()","err: ",e,"results:",n);o(e,n[1])});function e(e){s.nReplies=1;s.session=new novacom.Session(s.device,e)}function n(e){a.verbose("deviceInfo#systemInfo#_getSystemInfo()");var n=s.session.getDevice();var o=n.lunaAddr.deviceInfoSystem;var r={keys:["modelName","sdkVersion","firmwareVersion","boardType","otaId"],subscribe:false};luna.sendWithoutErrorHandle(s,o,r,function(e,n){a.silly("deviceInfo#systemInfo#_getSystemInfo():","lineObj:",e);var o=e;if(o){o=t(e,r.keys);if(o.length>0){a.verbose("deviceInfo#systemInfo#_getSystemInfo():","success");n(null,o)}else{a.verbose("deviceInfo#systemInfo#_getSystemInfo():","resultValue is empty");a.verbose("deviceInfo#systemInfo#_getSystemInfo(): luna-send command failed"+(e.errorText?" ("+e.errorText+")":e.errorMessage?" ("+e.errorMessage+")":""));i(n)}}else{n(new Error("deviceInfo#systemInfo#_getSystemInfo(): object format error"))}},e)}function t(e,n){a.verbose("deviceInfo#systemInfo#__makeReturnObj()");var o="";for(var r in n){if(e.hasOwnProperty(n[r]))o+=n[r]+" : "+e[n[r]]+"\n"}a.verbose("__makeReturnObj : "+o);return o.trim()}function i(e){a.verbose("deviceInfo#systemInfo#_getConfigs()");var n=s.session.getDevice();var o=n.lunaAddr.deviceInfoConfig;var r={configNames:["tv.model.modelname","tv.nyx.platformVersion","tv.nyx.firmwareVersion","tv.hw.SoCChipType","tv.nyx.tvBroadcastSystem","tv.rmm.grpCodeName"],subscribe:false};luna.sendWithoutErrorHandle(s,o,r,function(e,n){a.silly("deviceInfo#systemInfo#_getConfigs():","lineObj:",e);var o=e;if(o){if(o.returnValue){a.verbose("deviceInfo#systemInfo#_getConfigs():","returnValue is true");if(o.configs){o=f(o.configs);a.verbose("deviceInfo#systemInfo#_getConfigs():","success");n(null,o)}else{a.verbose("deviceInfo#systemInfo#_getConfigs():","configs not exist");n(new Error("deviceInfo#systemInfo#_getConfigs(): luna-send command failed (missingConfigs)"))}}else{a.verbose("deviceInfo#systemInfo#_getConfigs():","failure");n(new Error("deviceInfo#systemInfo#_getConfigs(): luna-send command failed"+(o.errorText?" ("+o.errorText+")":o.errorMessage?" ("+o.errorMessage+")":"")))}}else{n(new Error("deviceInfo#systemInfo#_getConfigs(): object format error"))}},e)}function f(e){a.verbose("deviceInfo#systemInfo#__makeConfigObj()");var n="";if(e.hasOwnProperty("tv.model.modelname")){n+="modelName : "+e["tv.model.modelname"]+"\n"}if(e.hasOwnProperty("tv.nyx.platformVersion")){n+="sdkVersion : "+e["tv.nyx.platformVersion"]+"\n"}if(e.hasOwnProperty("tv.nyx.firmwareVersion")){n+="firmwareVersion : "+e["tv.nyx.firmwareVersion"]+"\n"}var o="";if(e.hasOwnProperty("tv.hw.SoCChipType")){o+=e["tv.hw.SoCChipType"]}if(e.hasOwnProperty("tv.nyx.tvBroadcastSystem")){o+="_"+e["tv.nyx.tvBroadcastSystem"]}if(e.hasOwnProperty("tv.rmm.grpCodeName")){o+="_"+e["tv.rmm.grpCodeName"]}if(o!==""){n+="boardType : "+o+"\n"}a.verbose("__makeConfigObj:",n);return n.trim()}}};if(typeof module!=="undefined"&&module.exports){module.exports=e}})(); \ No newline at end of file diff --git a/vendor/webos_cli_tv.zip b/vendor/webos_cli_tv.zip index 356a3a7..ab12906 100644 Binary files a/vendor/webos_cli_tv.zip and b/vendor/webos_cli_tv.zip differ