Rename application to Snapweb

snapcore · 978fc76a95199aecb1ae735fe3c4459068eb9318 · stevenwilkin committed Jun 16, 2016 · Jun 16, 2016 · 978fc76
1 parent 9a9b0d1
commit 978fc76a95199aecb1ae735fe3c4459068eb9318
diff --git a/build.sh b/build.sh
@@ -43,7 +43,7 @@ gobuild() {
 
     mkdir -p $output_dir
     cd $output_dir
-    GOARCH=$arch GOARM=7 CGO_ENABLED=1 CC=${plat_abi}-gcc go build -ldflags "-extld=${plat_abi}-gcc" github.com/snapcore/snapweb/cmd/snappyd
+    GOARCH=$arch GOARM=7 CGO_ENABLED=1 CC=${plat_abi}-gcc go build -ldflags "-extld=${plat_abi}-gcc" github.com/snapcore/snapweb/cmd/snapweb
     cd - > /dev/null
 }
 
diff --git a/cmd/snappyd/handlers.go → cmd/snapweb/handlers.go b/cmd/snappyd/handlers.go → cmd/snapweb/handlers.go
diff --git a/cmd/snappyd/handlers_test.go → cmd/snapweb/handlers_test.go b/cmd/snappyd/handlers_test.go → cmd/snapweb/handlers_test.go
diff --git a/cmd/snappyd/snappyd.go → cmd/snapweb/main.go b/cmd/snappyd/snappyd.go → cmd/snapweb/main.go
@@ -30,15 +30,15 @@ var logger *log.Logger
 const httpAddr string = ":4200"
 
 func init() {
-	logger = log.New(os.Stderr, "Snappy: ", log.Ldate|log.Ltime|log.Lshortfile)
+	logger = log.New(os.Stderr, "Snapweb: ", log.Ldate|log.Ltime|log.Lshortfile)
 }
 
 func main() {
 	initURLHandlers(logger)
 
 	go avahi.Init(logger)
 
-	logger.Println("Snappy starting...")
+	logger.Println("Snapweb starting...")
 
 	if err := http.ListenAndServe(httpAddr, nil); err != nil {
 		logger.Printf("http.ListendAndServer() failed with %s\n", err)
diff --git a/gulpfile.js b/gulpfile.js
@@ -54,7 +54,7 @@ function createBundler(watch) {
 function bundleShared(bundler) {
   return bundler.bundle()
     .on('error', gutil.log.bind(gutil, 'Browserify Error'))
-    .pipe(source('webdm.js'))
+    .pipe(source('snapweb.js'))
       .pipe(buffer())
       .pipe(sourcemaps.init({loadMaps: true})) // loads map from browserify file
       .pipe(uglify())
@@ -111,7 +111,7 @@ gulp.task('styles', ['styles:clean'], function() {
   .pipe(sourcemaps.init())
   .pipe(postcss(processors))
   .pipe(csso())
-  .pipe(concat('webdm.css'))
+  .pipe(concat('snapweb.css'))
   .pipe(sourcemaps.write('./'))
   .pipe(gulp.dest('www/public/css'));
 });
diff --git a/pkg/meta/snap.yaml b/pkg/meta/snap.yaml
@@ -1,6 +1,6 @@
-name: webdm
+name: snapweb
 version: 0.19
-summary: Ubuntu Core Snappy Device Manager
+summary: Beautiful and functional interface for snap management
 description: |
   This service allows you to manage your Ubuntu Core device from a web interface or REST API.
 
@@ -10,12 +10,11 @@ description: |
   - control the state of other snappy packages.
   - browse the store to install new snappy packages.
 icon: meta/gui/icon.png
-source: lp:webdm
 type: app
 architectures: UNKNOWN_ARCH
 apps:
-  snappyd:
+  snapweb:
     daemon: simple
-    description: Snappy WebDM
-    command: snappyd
+    description: Snapweb
+    command: snapweb
     plugs: [network, network-bind, snapd-control]
diff --git a/pkg/snappyd → pkg/snapweb b/pkg/snappyd → pkg/snapweb
@@ -18,7 +18,7 @@ case $platform in
         ;;
 esac
 
-exec $SNAP/bin/$plat_abi/snappyd
+exec $SNAP/bin/$plat_abi/snapweb
 
 # never reach this
 exit 1
diff --git a/www/src/js/app.js b/www/src/js/app.js
@@ -12,14 +12,14 @@ if (window.__agent) {
 var LayoutView = require('./views/layout.js');
 var router = require('./routers/router.js');
 
-var webdm = new Marionette.Application();
+var snapweb = new Marionette.Application();
 var layout = new LayoutView();
 layout.render();
 
 $(document).ready(function() {
-  webdm.start();
+  snapweb.start();
 });
 
-webdm.on('start', function() {
+snapweb.on('start', function() {
   Backbone.history.start({pushState: true});
 });
diff --git a/www/src/js/config.js b/www/src/js/config.js
@@ -2,11 +2,11 @@ module.exports = {
   PACKAGES: '/api/v2/packages/',
   SETTINGS: '/api/v2/packages/ubuntu-core',
   FILTERED_SNAPS: [
-    'webdm',
+    'snapweb',
     'ubuntu-core'
   ],
   NON_INSTALLABLE_IDS: [
-    'webdm',
+    'snapweb',
     'ubuntu-core'
   ],
   NON_INSTALLABLE_TYPES: [
diff --git a/www/src/js/views/layout-banner.js b/www/src/js/views/layout-banner.js
@@ -27,12 +27,12 @@ module.exports = Marionette.ItemView.extend({
 
   // XXX ugh, use a model
   serializeData: function() {
-    var webdm = window.WEBDM;
+    var snapweb = window.SNAPWEB;
     var path = window.location.pathname.split('/')[1];
     return {
       'query': window.decodeURI(window.location.search.slice(3)) || '',
-      'name': webdm.NAME,
-      'subname': webdm.SUBNAME,
+      'name': snapweb.NAME,
+      'subname': snapweb.SUBNAME,
       'isHomeActive': (path === ''),
       'isStoreActive': (path === 'store'),
       //'isSearchActive': (path === 'search'),
diff --git a/www/templates/base.html b/www/templates/base.html
@@ -1,11 +1,11 @@
 <!doctype html>
 <html>
   <head>
-    <title>WebDM</title>
+    <title>Snapweb</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" href="/public/images/favicon.ico">
-    <link rel="stylesheet" href="/public/css/webdm.css">
+    <link rel="stylesheet" href="/public/css/snapweb.css">
   </head>
   <body>
     <div class="b-layout">
@@ -14,11 +14,11 @@
       <div class="b-layout__footer"></div>
     </div>
     <script>
-      var WEBDM = WEBDM || {};
-      WEBDM.NAME = '{{ .Branding.Name }}';
-      WEBDM.SUBNAME = '{{ .Branding.Subname }}';
-      WEBDM.SNAPD_VERSION = '{{ .SnapdVersion }}';
+      var SNAPWEB = SNAPWEB || {};
+      SNAPWEB.NAME = '{{ .Branding.Name }}';
+      SNAPWEB.SUBNAME = '{{ .Branding.Subname }}';
+      SNAPWEB.SNAPD_VERSION = '{{ .SnapdVersion }}';
     </script>
-    <script src="/public/js/webdm.js"></script>
+    <script src="/public/js/snapweb.js"></script>
   </body>
 </html>