fix(output): fix terminal output issues

bleenco · Nov 10, 2017 · e0fd26a · e0fd26a
1 parent 925684d
commit e0fd26a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/src/api/docker.ts b/src/api/docker.ts
@@ -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(/\/\/(.*)@/, '//');
           }

diff --git a/src/app/components/app-images/app-images.component.ts b/src/app/components/app-images/app-images.component.ts
@@ -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',

diff --git a/src/app/components/app-job/app-job.component.ts b/src/app/components/app-job/app-job.component.ts
@@ -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;
 

diff --git a/src/files/docker-essential/entry.sh b/src/files/docker-essential/entry.sh
@@ -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}