Index: build/assemble-source-from-google.sh ================================================================== --- build/assemble-source-from-google.sh +++ build/assemble-source-from-google.sh @@ -35,11 +35,11 @@ # Copy out PC/SC headers for later use mkdir -p "${instdir}/include/PCSC" || exit 1 cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1 # Update one of the JavaScript files to provide a better interface - sed ' + sed -i ' s@naclModuleMessageChannel.*opt_serverAppId@&, opt_naclElement@ /opt_naclElement/ a \ if (naclModuleMessageChannel == null && opt_naclElement != null) { naclModuleMessageChannel = new GoogleSmartCard.NaclModuleMessageChannel(opt_naclElement, GoogleSmartCard.Logging.getScopedLogger("NaclModule<>")); } ' third_party/pcsc-lite/naclport/cpp_client/src/nacl-client-backend.js @@ -143,11 +143,11 @@ ) cat "${files[@]}" | sed ' /^ *goog\.require(/ d; s@^goog\.DEPENDENCIES_ENABLED = .*$@goog.DEPENDENCIES_ENABLED = false;@ ' > "${instdir}/libpcsc.js.new" || exit 1 - mv "${instdir}/libpcsc.js.new" "${isntdir}/libpcsc.js" || exit 1 + mv "${instdir}/libpcsc.js.new" "${instdir}/libpcsc.js" || exit 1 # Assemble all the files into a single tree files=( common/cpp/src/google_smart_card_common/formatting.h common/cpp/src/google_smart_card_common/logging/function_call_tracer.cc