Permalink
Browse files

fix(output): fix terminal output issues

  • Loading branch information...
jkuri committed Nov 10, 2017
1 parent 925684d commit e0fd26a0790434e60783f201c355ee2e1ac7b70d
@@ -110,7 +110,8 @@ export function attachExec(id: string, cmd: any): Observable<any> {
} else if (str.includes('[success]')) {
exitCode = 0;
ws.end();
} else if (!str.includes('/usr/bin/abstruse') && !str.startsWith('>')) {
} else if (!str.includes('/usr/bin/abstruse') && !str.startsWith('>') &&
!str.startsWith('abstruse@')) {
if (str.includes('//') && str.includes('@')) {
str = str.replace(/\/\/(.*)@/, '//');
}
@@ -182,6 +182,7 @@ export class AppImagesComponent implements OnInit, OnDestroy {
'RUN cd /home/abstruse && sudo chown -Rv 1000:100 /home/abstruse',
'',
'RUN sudo chmod +x /entry.sh /etc/init.d/* /usr/bin/abstruse*',
'ENTRYPOINT ["/bin/bash"]',
'CMD ["/entry.sh"]',
'',
'EXPOSE 22 5900',
@@ -77,6 +77,7 @@ export class AppJobComponent implements OnInit, OnDestroy {
this.processing = false;
} else if (event.type === 'job restarted' && event.data === this.id) {
this.processing = false;
this.terminalInput = { clear: true };
} else if (event.type === 'exposed ports') {
const portData = event.data && event.data.info || null;

@@ -3,7 +3,7 @@
VNC_STORE_PWD_FILE=/home/abstruse/.vnc/passwd
if [ ! -e "${VNC_STORE_PWD_FILE}" -o -n "${VNC_PASSWORD}" ]; then
mkdir -vp /home/abstruse/.vnc
x11vnc -storepasswd ${VNC_PASSWORD:-abstruse} ${VNC_STORE_PWD_FILE}
x11vnc -storepasswd ${VNC_PASSWORD:-abstruse} ${VNC_STORE_PWD_FILE} &> /dev/null
fi

export CHROME=${CHROME:-/opt/google/chrome/google-chrome}

0 comments on commit e0fd26a

Please sign in to comment.